Fix dimension highlighting problems

Derived all lines from PrimPath

src/Mod/TechDraw/App/DrawViewDimension.cpp

@@ -95,6 +95,7 @@ DrawViewDimension::DrawViewDimension(void)
     ADD_PROPERTY_TYPE(Fontsize,(4)    ,"Format",(App::PropertyType)(App::Prop_None),"Dimension text size in mm");
     ADD_PROPERTY_TYPE(FormatSpec,("%value%") ,"Format",(App::PropertyType)(App::Prop_None),"Dimension Format");
     ADD_PROPERTY_TYPE(LineWidth,(0.5)    ,"Format",(App::PropertyType)(App::Prop_None),"Dimension line weight");
+    //ADD_PROPERTY_TYPE(CentreLines,(0) ,"Format",(App::PropertyType)(App::Prop_None),"Arc Dimension Center Mark");
 
     Type.setEnums(TypeEnums);                                          //dimension type: length, radius etc
     ADD_PROPERTY(Type,((long)0));
@@ -130,6 +131,7 @@ void DrawViewDimension::onChanged(const App::Property* prop)
             prop == &Font        ||
             prop == &Fontsize    ||
             prop == &FormatSpec  ||
+            //prop == &CentreLines ||
             prop == &LineWidth) {
             try {
                 App::DocumentObjectExecReturn *ret = recompute();

src/Mod/TechDraw/App/DrawViewDimension.h

@@ -56,6 +56,7 @@ class TechDrawExport DrawViewDimension : public TechDraw::DrawView
     App::PropertyFloat   Fontsize;
     App::PropertyString  FormatSpec;
     App::PropertyFloat   LineWidth;
+    //App::PropertyBool    CentreLines;
 
     //TODO: do we need a property for the actual dimension value? how else to access from Py?
     //wf: expose getValue & getFormatedValue

src/Mod/TechDraw/Gui/CMakeLists.txt

@@ -132,6 +132,8 @@ SET(TechDrawGuiView_SRCS
     QGIPrimPath.h
     QGICMark.cpp
     QGICMark.h
+    QGIDimLines.cpp
+    QGIDimLines.h
     TemplateTextField.cpp
     TemplateTextField.h
     ZVALUE.h

src/Mod/TechDraw/Gui/QGCustomText.cpp

@@ -50,6 +50,9 @@ QGCustomText::QGCustomText()
     setAcceptHoverEvents(false);
     setFlag(QGraphicsItem::ItemIsSelectable, false);
     setFlag(QGraphicsItem::ItemIsMovable, false);
+
+    isHighlighted = false;
+    m_colCurrent = getNormalColor();
 }
 
 void QGCustomText::centerAt(QPointF centerPos)
@@ -72,6 +75,50 @@ void QGCustomText::centerAt(double cX, double cY)
     setPos(newX,newY);
 }
 
+QVariant QGCustomText::itemChange(GraphicsItemChange change, const QVariant &value)
+{
+    if (change == ItemSelectedHasChanged && scene()) {
+        if(isSelected()) {
+            setPrettySel();
+        } else {
+            setPrettyNormal();
+        }
+    }
+    return QGraphicsTextItem::itemChange(change, value);
+}
+
+
+void QGCustomText::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
+{
+    if (!isSelected()) {
+        setPrettyPre();
+    }
+    QGraphicsTextItem::hoverEnterEvent(event);
+}
+
+void QGCustomText::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
+{
+    if(!isSelected() && !isHighlighted) {
+        setPrettyNormal();
+    }
+    QGraphicsTextItem::hoverLeaveEvent(event);
+}
+
+void QGCustomText::setPrettyNormal() {
+    m_colCurrent = getNormalColor();
+    update();
+}
+
+void QGCustomText::setPrettyPre() {
+    m_colCurrent = getPreColor();
+    update();
+}
+
+void QGCustomText::setPrettySel() {
+    m_colCurrent = getSelectColor();
+    update();
+}
+
 void QGCustomText::paint ( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget) {
     QStyleOptionGraphicsItem myOption(*option);
     myOption.state &= ~QStyle::State_Selected;
@@ -102,6 +149,7 @@ void QGCustomText::paint ( QPainter * painter, const QStyleOptionGraphicsItem *
         painter->scale(1.0,1.0);
     }
 
+    setDefaultTextColor(m_colCurrent);
     QGraphicsTextItem::paint (painter, &myOption, widget);
 }
 

src/Mod/TechDraw/Gui/QGCustomText.h

@@ -32,6 +32,8 @@ class QPainter;
 class QStyleOptionGraphicsItem;
 QT_END_NAMESPACE
 
+#include <Base/Parameter.h>
+
 namespace TechDrawGui
 {
 
@@ -44,20 +46,32 @@ class TechDrawGuiExport QGCustomText : public QGraphicsTextItem
     enum {Type = QGraphicsItem::UserType + 130};
     int type() const { return Type;}
 
+    void setHighlighted(bool state);
+    void setPrettyNormal();
+    void setPrettyPre();
+    void setPrettySel();
+
     virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 );
     virtual void centerAt(QPointF centerPos);
     virtual void centerAt(double cX, double cY);
 
 protected:
+    virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
+    virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
+    QVariant itemChange(GraphicsItemChange change, const QVariant &value);
+
     QColor getNormalColor(void);
     QColor getPreColor(void);
     QColor getSelectColor(void);
     Base::Reference<ParameterGrp> getParmGroup(void);
 
+    bool isHighlighted;
+    QColor m_colCurrent;
+
 private:
 
 };
 
-} // namespace MDIViewPageGui
+}
 
 #endif // DRAWINGGUI_QGCUSTOMTEXT_H

src/Mod/TechDraw/Gui/QGICMark.cpp

@@ -42,7 +42,7 @@ using namespace TechDrawGui;
 QGICMark::QGICMark(int index) : QGIVertex(index)
 {
     m_size = 3.0;
-    m_thick = 0.75;
+    m_width = 0.75;
     draw();
 }
 void QGICMark::draw(void)
@@ -63,8 +63,7 @@ void QGICMark::setSize(float s)
 
 void QGICMark::setThick(float t)
 {
-    m_thick = t;
-    m_pen.setWidthF(m_thick);
+    m_width = t;
     draw();
 }
 
@@ -86,7 +85,5 @@ void QGICMark::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
     QStyleOptionGraphicsItem myOption(*option);
     myOption.state &= ~QStyle::State_Selected;
 
-    m_pen.setWidthF(m_thick);
-
     QGIVertex::paint (painter, &myOption, widget);
 }

src/Mod/TechDraw/Gui/QGICMark.h

@@ -43,7 +43,7 @@ class TechDrawGuiExport QGICMark : public QGIVertex
     void draw(void);
     float getSize() { return m_size; }
     void setSize(float s);
-    float getThick() { return m_thick; }
+    float getThick() { return m_width; }
     void setThick(float t);
     virtual void setPrettyNormal();
 
@@ -53,7 +53,6 @@ class TechDrawGuiExport QGICMark : public QGIVertex
 
 private:
     float m_size;
-    float m_thick;
 };
 
 }

src/Mod/TechDraw/Gui/QGIDimLines.cpp

@@ -0,0 +1,61 @@
+/***************************************************************************
+ *   Copyright (c) 2016 WandererFan <wandererfan@gmail.com>                *
+ *                                                                         *
+ *   This file is part of the FreeCAD CAx development system.              *
+ *                                                                         *
+ *   This library is free software; you can redistribute it and/or         *
+ *   modify it under the terms of the GNU Library General Public           *
+ *   License as published by the Free Software Foundation; either          *
+ *   version 2 of the License, or (at your option) any later version.      *
+ *                                                                         *
+ *   This library  is distributed in the hope that it will be useful,      *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU Library General Public License for more details.                  *
+ *                                                                         *
+ *   You should have received a copy of the GNU Library General Public     *
+ *   License along with this library; see the file COPYING.LIB. If not,    *
+ *   write to the Free Software Foundation, Inc., 59 Temple Place,         *
+ *   Suite 330, Boston, MA  02111-1307, USA                                *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "PreCompiled.h"
+#ifndef _PreComp_
+#include <assert.h>
+#include <QGraphicsScene>
+#include <QMenu>
+#include <QMouseEvent>
+#include <QGraphicsSceneHoverEvent>
+#include <QStyleOptionGraphicsItem>
+#include <QPainterPathStroker>
+#include <QPainter>
+#endif
+
+#include "QGIView.h"
+#include "QGIDimLines.h"
+
+using namespace TechDrawGui;
+
+QGIDimLines::QGIDimLines()
+{
+    setCacheMode(QGraphicsItem::NoCache);
+    setAcceptHoverEvents(false);
+    setFlag(QGraphicsItem::ItemIsSelectable, false);
+    setFlag(QGraphicsItem::ItemIsMovable, false);
+
+    m_width = 0.5;
+}
+
+void QGIDimLines::draw()
+{
+}
+
+//probably don't need this paint
+void QGIDimLines::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    QStyleOptionGraphicsItem myOption(*option);
+    myOption.state &= ~QStyle::State_Selected;
+
+    QGIPrimPath::paint (painter, &myOption, widget);
+}

src/Mod/TechDraw/Gui/QGIDimLines.h

@@ -0,0 +1,62 @@
+/***************************************************************************
+ *   Copyright (c) 2016 WandererFan <wandererfan@gmail.com>                *
+ *                                                                         *
+ *   This file is part of the FreeCAD CAx development system.              *
+ *                                                                         *
+ *   This library is free software; you can redistribute it and/or         *
+ *   modify it under the terms of the GNU Library General Public           *
+ *   License as published by the Free Software Foundation; either          *
+ *   version 2 of the License, or (at your option) any later version.      *
+ *                                                                         *
+ *   This library  is distributed in the hope that it will be useful,      *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU Library General Public License for more details.                  *
+ *                                                                         *
+ *   You should have received a copy of the GNU Library General Public     *
+ *   License along with this library; see the file COPYING.LIB. If not,    *
+ *   write to the Free Software Foundation, Inc., 59 Temple Place,         *
+ *   Suite 330, Boston, MA  02111-1307, USA                                *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef DRAWINGGUI_QGRAPHICSITEMDIMLINES_H
+#define DRAWINGGUI_QGRAPHICSITEMDIMLINES_H
+
+# include "QGIPrimPath.h"
+
+QT_BEGIN_NAMESPACE
+class QPainter;
+class QStyleOptionGraphicsItem;
+QT_END_NAMESPACE
+
+namespace TechDrawGui
+{
+
+class TechDrawGuiExport QGIDimLines : public QGIPrimPath
+{
+public:
+    explicit QGIDimLines();
+    ~QGIDimLines() {}
+
+    enum {Type = QGraphicsItem::UserType + 172};
+    int type() const { return Type;}
+
+public:
+    void draw();
+    //void setHighlighted(bool state);
+    //double getLineWidth() { return m_lineWidth; }
+    //void setLineWidth(double w);
+    //QPainterPath shape() const;
+    virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 );
+
+protected:
+    //QVariant itemChange(GraphicsItemChange change, const QVariant &value);
+
+
+private:
+};
+
+}
+
+#endif // DRAWINGGUI_QGRAPHICSITEMDIMLINES_H

src/Mod/TechDraw/Gui/QGIEdge.cpp

@@ -46,10 +46,10 @@ QGIEdge::QGIEdge(int index) :
     projIndex(index),
     isCosmetic(false),
     isHiddenEdge(false),
-    isSmoothEdge(false),
-    strokeWidth(1.0)
+    isSmoothEdge(false)
 {
-    m_pen.setCosmetic(isCosmetic);
+    m_width = 1.0;
+    setCosmetic(isCosmetic);
 }
 
 QRectF QGIEdge::boundingRect() const
@@ -70,14 +70,11 @@ QPainterPath QGIEdge::shape() const
 void QGIEdge::setCosmetic(bool state)
 {
     isCosmetic = state;
-    m_pen.setCosmetic(state);
-    update();
+    if (state) {
+        setWidth(0.0);
+    }
 }
 
-void QGIEdge::setStrokeWidth(float width) {
-    strokeWidth = width;
-    update();
-}
 
 void QGIEdge::setHiddenEdge(bool b) {
     isHiddenEdge = b;
@@ -118,6 +115,5 @@ void QGIEdge::paint ( QPainter * painter, const QStyleOptionGraphicsItem * optio
     QStyleOptionGraphicsItem myOption(*option);
     myOption.state &= ~QStyle::State_Selected;
 
-    m_pen.setWidthF(strokeWidth);
     QGIPrimPath::paint (painter, &myOption, widget);
 }

src/Mod/TechDraw/Gui/QGIEdge.h

@@ -44,7 +44,6 @@ class TechDrawGuiExport QGIEdge : public QGIPrimPath
     int getProjIndex() const { return projIndex; }
 
     void setCosmetic(bool state);
-    void setStrokeWidth(float width);
     void setHiddenEdge(bool b);
     bool getHiddenEdge() { return(isHiddenEdge); }
     void setSmoothEdge(bool b) { isSmoothEdge = b; }
@@ -61,7 +60,6 @@ class TechDrawGuiExport QGIEdge : public QGIPrimPath
     Qt::PenStyle getHiddenStyle();
 
 private:
-    float strokeWidth;
 };
 
 }