Added the support for user defined shapes.

Removed the QtSvgdll as it is not needed anymore.
Caching the OMC commands so that library browsing become more faster.
More enhanced library icons.



git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@7273 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: adeas31

OMEdit/OMEditGUI/Component.cpp

@@ -35,7 +35,7 @@
 
 Component::Component(QString value, QString name, QString className, QPointF position, int type, bool connector,
                      OMCProxy *omc, GraphicsView *graphicsView, Component *pParent)
-    : ShapeAnnotation(pParent), mAnnotationString(value), mName(name), mClassName(className), mType(type),
+    : ShapeAnnotation(graphicsView, pParent), mAnnotationString(value), mName(name), mClassName(className), mType(type),
       mIsConnector(connector), mpOMCProxy(omc), mpGraphicsView(graphicsView)
 {
     mIsLibraryComponent = false;
@@ -44,17 +44,25 @@ Component::Component(QString value, QString name, QString className, QPointF pos
 
     parseAnnotationString(this, value);
     // if component is an icon
-    if (mType == StringHandler::ICON)
+    if ((mType == StringHandler::ICON))
     {
-        scale(Helper::globalIconXScale, Helper::globalIconYScale);
         setPos(position);
-        setComponentFlags();
-        setAcceptHoverEvents(true);
-        getClassComponents(mClassName, mType);
-        createActions();
+        if (mpGraphicsView->mpParentProjectTab->isReadOnly())
+        {
+            scale(Helper::globalDiagramXScale, Helper::globalDiagramYScale);
+            getClassComponents(mClassName, mType);
+        }
+        else
+        {
+            scale(Helper::globalIconXScale, Helper::globalIconYScale);
+            setComponentFlags();
+            setAcceptHoverEvents(true);
+            getClassComponents(mClassName, mType);
+            createActions();
+        }
     }
     // if component is a diagram
-    else if (mType == StringHandler::DIAGRAM)
+    else if ((mType == StringHandler::DIAGRAM))
     {
         scale(Helper::globalDiagramXScale, Helper::globalDiagramYScale);
         setPos(position);
@@ -121,7 +129,7 @@ Component::Component(QString value, QString className, OMCProxy *omc, Component
     mType = StringHandler::ICON;
     mIsConnector = false;
 
-    parseAnnotationString(this, value);
+    parseAnnotationString(this, value, true);
     getClassComponents(mClassName, mType);
 }
 
@@ -137,7 +145,12 @@ Component::Component(QString value, QString className, Component *pParent)
     mpComponentProperties = 0;
     mType = StringHandler::ICON;
     mIsConnector = false;
-    parseAnnotationString(this, mAnnotationString);
+    parseAnnotationString(this, mAnnotationString, true);
+
+    //! @todo Since for some components we get empty annotations but its inherited componets does have annotations
+    //! @todo so set the parent give the parent bounding box the value of inherited class boundingbox.
+    if (mRectangle.width() > 1)
+        getRootParentComponent()->mRectangle = mRectangle;
 }
 
 /* Used for Library Component. Called for component annotation instance */
@@ -151,13 +164,19 @@ Component::Component(QString value, QString className, QString transformationStr
     mpOMCProxy = pParent->mpOMCProxy;
     mType = StringHandler::ICON;
     mIsConnector = false;
-    parseAnnotationString(this, mAnnotationString);
+    parseAnnotationString(this, mAnnotationString, true);
     mpTransformation = new Transformation(this);
+    setTransform(mpTransformation->getTransformationMatrix());
+
+    //! @todo Since for some components we get empty annotations but its inherited componets does have annotations
+    //! @todo so set the parent give the parent bounding box the value of inherited class boundingbox.
+    if (mRectangle.width() > 1)
+        getRootParentComponent()->mRectangle = mRectangle;
 }
 
 Component::Component(Component *pComponent, QString name, QPointF position, int type, bool connector,
                      GraphicsView *graphicsView, Component *pParent)
-    : ShapeAnnotation(pParent), mName(name), mType(type), mIsConnector(connector), mpGraphicsView(graphicsView)
+    : ShapeAnnotation(graphicsView, pParent), mName(name), mType(type), mIsConnector(connector), mpGraphicsView(graphicsView)
 {
     mpParentComponent = pParent;
     mClassName = pComponent->mClassName;
@@ -171,18 +190,26 @@ Component::Component(Component *pComponent, QString name, QPointF position, int
 
     parseAnnotationString(this, mAnnotationString);
     // if component is an icon
-    if (mType == StringHandler::ICON)
+    if ((mType == StringHandler::ICON))
     {
-        scale(Helper::globalIconXScale, Helper::globalIconYScale);
         setPos(position);
-        setComponentFlags();
-        setAcceptHoverEvents(true);
-        copyClassComponents(pComponent);
-        createSelectionBox();
-        createActions();
+        if (mpGraphicsView->mpParentProjectTab->isReadOnly())
+        {
+            scale(Helper::globalDiagramXScale, Helper::globalDiagramYScale);
+            copyClassComponents(pComponent);
+        }
+        else
+        {
+            scale(Helper::globalIconXScale, Helper::globalIconYScale);
+            setComponentFlags();
+            setAcceptHoverEvents(true);
+            copyClassComponents(pComponent);
+            createSelectionBox();
+            createActions();
+        }
     }
     // if component is a diagram
-    else if (mType == StringHandler::DIAGRAM)
+    else if ((mType == StringHandler::DIAGRAM))
     {
         scale(Helper::globalDiagramXScale, Helper::globalDiagramYScale);
         setPos(position);
@@ -210,7 +237,7 @@ Component::~Component()
 
 //! Parses the result of getIconAnnotation command.
 //! @param value is the result of getIconAnnotation command obtained from OMC.
-bool Component::parseAnnotationString(Component *item, QString value)
+bool Component::parseAnnotationString(Component *item, QString value, bool libraryIcon)
 {
     value = StringHandler::removeFirstLastCurlBrackets(value);
     if (value.isEmpty())
@@ -292,12 +319,16 @@ bool Component::parseAnnotationString(Component *item, QString value)
             EllipseAnnotation *ellipseAnnotation = new EllipseAnnotation(shape, item);
             item->mpShapesList.append(ellipseAnnotation);
         }
-        if (shape.startsWith("Text"))
+        // don't parse the text annotation for library icon
+        if (!libraryIcon)
         {
-            shape = shape.mid(QString("Text").length());
-            shape = StringHandler::removeFirstLastBrackets(shape);
-            TextAnnotation *textAnnotation = new TextAnnotation(shape, item);
-            item->mpShapesList.append(textAnnotation);
+            if (shape.startsWith("Text"))
+            {
+                shape = shape.mid(QString("Text").length());
+                shape = StringHandler::removeFirstLastBrackets(shape);
+                TextAnnotation *textAnnotation = new TextAnnotation(shape, item);
+                item->mpShapesList.append(textAnnotation);
+            }
         }
     }
 }
@@ -349,7 +380,7 @@ void Component::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 void Component::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
     // if user is viewing the component in Icon View
-    if (mpGraphicsView->mIconType == StringHandler::DIAGRAM)
+    if ((mpGraphicsView->mIconType == StringHandler::DIAGRAM) or (mpGraphicsView->mpParentProjectTab->isReadOnly()))
         return;
     // if we are creating the connector then make sure user can not select and move components
     if ((mpGraphicsView->mIsCreatingConnector) and !mpParentComponent)
@@ -652,73 +683,6 @@ void Component::deleteMe()
     delete(this);
 }
 
-//! Slot that moves component one pixel upwards
-//! @see moveDown()
-//! @see moveLeft()
-//! @see moveRight()
-void Component::moveUp()
-{
-    this->setPos(this->pos().x(), this->mapFromScene(this->mapToScene(this->pos())).y()+1);
-    mpGraphicsView->scene()->update();
-}
-
-//! Slot that moves component one pixel downwards
-//! @see moveUp()
-//! @see moveLeft()
-//! @see moveRight()
-void Component::moveDown()
-{
-    this->setPos(this->pos().x(), this->mapFromScene(this->mapToScene(this->pos())).y()-1);
-    mpGraphicsView->scene()->update();
-}
-
-//! Slot that moves component one pixel leftwards
-//! @see moveUp()
-//! @see moveDown()
-//! @see moveRight()
-void Component::moveLeft()
-{
-    this->setPos(this->mapFromScene(this->mapToScene(this->pos())).x()-1, this->pos().y());
-    mpGraphicsView->scene()->update();
-}
-
-//! Slot that moves component one pixel rightwards
-//! @see moveUp()
-//! @see moveDown()
-//! @see moveLeft()
-void Component::moveRight()
-{
-    this->setPos(this->mapFromScene(this->mapToScene(this->pos())).x()+1, this->pos().y());
-    mpGraphicsView->scene()->update();
-}
-
-void Component::rotateClockwise()
-{
-    qreal rotation = this->rotation();
-    qreal rotateIncrement = 90;
-
-    if (rotation == -270)
-        this->setRotation(0);
-    else
-        this->setRotation(rotation - rotateIncrement);
-}
-
-void Component::rotateAntiClockwise()
-{
-    qreal rotation = this->rotation();
-    qreal rotateIncrement = -90;
-
-    if (rotation == 270)
-        this->setRotation(0);
-    else
-        this->setRotation(rotation - rotateIncrement);
-}
-
-void Component::resetRotation()
-{
-    this->setRotation(0);
-}
-
 void Component::openIconProperties()
 {
     IconProperties *iconProperties = new IconProperties(this, mpGraphicsView->mpParentProjectTab->mpParentProjectTabWidget->mpParentMainWindow);

OMEdit/OMEditGUI/Component.h

@@ -118,7 +118,7 @@ class Component : public ShapeAnnotation
     QPointF mOldPosition;
     bool isMousePressed;
 
-    bool parseAnnotationString(Component *item, QString value);
+    bool parseAnnotationString(Component *item, QString value, bool libraryIcon = false);
     QRectF boundingRect() const;
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
     QString getName();
@@ -151,13 +151,6 @@ public slots:
     void showSelectionBox();
     void resizeComponent(qreal resizeFactorX, qreal resizeFactorY);
     void deleteMe();
-    void moveUp();
-    void moveDown();
-    void moveLeft();
-    void moveRight();
-    void rotateClockwise();
-    void rotateAntiClockwise();
-    void resetRotation();
     void openIconProperties();
     void openIconAttributes();
 protected:

OMEdit/OMEditGUI/ConnectorWidget.cpp

@@ -39,6 +39,7 @@
  */
 
 #include "ConnectorWidget.h"
+#include "Component.h"
 
 Connector::Connector(Component *pComponent, GraphicsView *pParentView, QGraphicsItem *pParent)
 {
@@ -47,7 +48,7 @@ Connector::Connector(Component *pComponent, GraphicsView *pParentView, QGraphics
     this->setStartComponent(pComponent);
     setFlags(QGraphicsItem::ItemIsFocusable);
     this->setPos(mpStartComponent->mapToScene(mpStartComponent->boundingRect().center()));
-    this->scale(Helper::globalIconXScale, Helper::globalIconYScale);
+    this->scale(1.0, 1.0);
     setZValue(-1.0);
     this->updateStartPoint(mpStartComponent->mapToScene(mpStartComponent->boundingRect().center()));
     this->mEndComponentConnected = false;
@@ -75,7 +76,7 @@ Connector::Connector(Component *pStartPort, Component *pEndPort, GraphicsView *p
     mPoints = points;
 
     //Setup the geometries vector based on the point geometry
-    for(int i=0; i != mPoints.size()-1; ++i)
+    for(int i = 0 ; i < mPoints.size()-1 ; ++i)
     {
         if(mPoints[i].x() == mPoints[i+1].x())
             mGeometries.push_back(Connector::VERTICAL);
@@ -91,7 +92,7 @@ Connector::Connector(Component *pStartPort, Component *pEndPort, GraphicsView *p
     connect(mpEndComponent->mpParentComponent, SIGNAL(componentDeleted()), SLOT(deleteMe()));
 
     //Create the lines, so that drawConnector has something to work with
-    for(int i = 0; i != mPoints.size()-1; ++i)
+    for(int i = 0 ; i < mPoints.size()-1 ; ++i)
     {
         ConnectorLine *tempLine = new ConnectorLine(mapFromScene(mPoints[i]).x(), mapFromScene(mPoints[i]).y(),
                                                     mapFromScene(mPoints[i+1]).x(), mapFromScene(mPoints[i+1]).y(),
@@ -109,9 +110,9 @@ Connector::Connector(Component *pStartPort, Component *pEndPort, GraphicsView *p
     this->drawConnector();
 
     //Make all lines selectable and all lines except first and last movable
-    for(int i=1; i!=mpLines.size()-1; ++i)
+    for(int i = 1 ; i < mpLines.size() - 1 ; ++i)
         mpLines[i]->setFlag(QGraphicsItem::ItemIsMovable, true);
-    for(int i=0; i!=mpLines.size(); ++i)
+    for(int i = 0 ; i < mpLines.size() ; ++i)
         mpLines[i]->setFlag(QGraphicsItem::ItemIsSelectable, true);
 
     mpStartComponent->mpParentComponent->addConnector(this);
@@ -493,7 +494,10 @@ ConnectorLine::ConnectorLine(qreal x1, qreal y1, qreal x2, qreal y2, int lineNum
     this->mParentConnectorEndComponentConnected = false;
     this->mActivePen = QPen(Qt::red);
     this->mPassivePen = QPen(Qt::black);
-    this->mHoverPen = QPen(Qt::darkRed, 7);
+    QPen pen (Qt::darkRed);
+    pen.setWidth(3);
+    pen.setCosmetic(true);
+    this->mHoverPen = pen;
 }
 
 //! Reimplementation of paint function. Removes the ugly dotted selection box.

OMEdit/OMEditGUI/ConnectorWidget.h

@@ -43,7 +43,7 @@
 
 #include <QtCore>
 #include <QtGui>
-#include "Component.h"
+//#include "Component.h"
 
 class ConnectorLine;
 class GraphicsView;