[Uml-devel] branches/work/soc-umbrello-2011/umbrello
Camila San Martin Ayres
smayres at gmail.com
Tue Aug 9 14:25:35 UTC 2011
SVN commit 1246005 by ayres:
Workin on EntityWidget.
M +1 -0 CMakeLists.txt
M +0 -2 soc-umbrello-2011/diagram.cpp
M +1 -0 soc-umbrello-2011/layoutgrid.cpp
M +9 -15 soc-umbrello-2011/umlscene.cpp
M +2 -3 soc-umbrello-2011/umlscene.h
M +40 -5 soc-umbrello-2011/umlview.cpp
M +14 -0 soc-umbrello-2011/umlview.h
M +6 -3 soc-umbrello-2011/umlwidget.cpp
M +2 -1 soc-umbrello-2011/umlwidget.h
M +4 -4 toolbarstate.cpp
M +3 -1 widgets/widget_factory.cpp
--- branches/work/soc-umbrello-2011/umbrello/CMakeLists.txt #1246004:1246005
@@ -82,6 +82,7 @@
soc-umbrello-2011/umlwidget.cpp
soc-umbrello-2011/boxwidget.cpp
soc-umbrello-2011/objectwidget.cpp
+ soc-umbrello-2011/entitywidget.cpp
)
set(libcodegenerator_SRCS
--- branches/work/soc-umbrello-2011/umbrello/soc-umbrello-2011/diagram.cpp #1246004:1246005
@@ -150,9 +150,7 @@
void Diagram::slotObjectCreated(UMLObject *obj)
{
- qDebug() << "entrou no novo metodo de criar widget";
- qDebug() << "widget criado";
UMLWidget* newWidget = Widget_Factory::create_Widget(UMLApp::app()->current_View(), obj);
--- branches/work/soc-umbrello-2011/umbrello/soc-umbrello-2011/layoutgrid.cpp #1246004:1246005
@@ -42,6 +42,7 @@
m_isTextVisible(false)
{
m_coordLabel = new QGraphicsTextItem(QString("0, 0"), this);
+ setVisible(false);
}
/**
--- branches/work/soc-umbrello-2011/umbrello/soc-umbrello-2011/umlscene.cpp #1246004:1246005
@@ -15,7 +15,6 @@
#include "umlview.h"
#include "folder.h"
-#include "layoutgrid.h"
#include "toolbarstatefactory.h"
#include "toolbarstate.h"
#include "uml.h"
@@ -34,11 +33,9 @@
m_snaptogrid(true),
m_gridvisible(true)
{
- if(m_view == NULL)
- qDebug() << "m_view at UMLScene is NULL!";
setBackgroundBrush(QColor(195, 195, 195));
- //m_layoutgrid = new LayoutGrid();
- //addItem(m_layoutgrid);
+ m_layoutgrid = new LayoutGrid(0, this);
+ addItem(m_layoutgrid);
setSceneRect(itemsBoundingRect());
m_imageexporter = new UMLViewImageExporter(m_view);
m_pToolBarStateFactory = new ToolBarStateFactory();
@@ -149,17 +146,7 @@
return m_snaptogrid;
}
-bool UMLScene::isSnapGridVisible() const
-{
- return m_gridvisible;
-}
-void UMLScene::setSnapGridVisible(bool bShow)
-{
- m_layoutgrid->setVisible(bShow);
- emit sigShowGridToggled(bShow);
-}
-
const Settings::OptionState &UMLScene::options() const
{
return m_Options;
@@ -217,4 +204,11 @@
//m_bPaste = false;
}
+LayoutGrid *UMLScene::layoutGrid()
+{
+ return m_layoutgrid;
+}
+
+
+
}
\ No newline at end of file
--- branches/work/soc-umbrello-2011/umbrello/soc-umbrello-2011/umlscene.h #1246004:1246005
@@ -15,6 +15,7 @@
#include <QGraphicsScene>
#include <QGraphicsSceneMouseEvent>
+#include "layoutgrid.h"
#include "optionstate.h"
class UMLFolder;
@@ -49,8 +50,8 @@
void setSnapSpacing(int x, int y);
qreal snapped(qreal _x, qreal _y);
bool snapToGrid() const;
- bool isSnapGridVisible() const;
void setSnapGridVisible(bool bShow);
+ LayoutGrid *layoutGrid();
void setUseFillColor(bool ufc);
QColor fillColor() const;
@@ -65,8 +66,6 @@
void resetToolbar();
signals:
- void sigShowGridToggled(bool);
- void sigSnapToGridToggled(bool);
void sigResetToolBar();
public slots:
--- branches/work/soc-umbrello-2011/umbrello/soc-umbrello-2011/umlview.cpp #1246004:1246005
@@ -25,6 +25,7 @@
#include "widgetbase.h"
#include <kinputdialog.h>
#include "object_factory.h"
+#include "umlviewimageexporter.h"
#include <QGraphicsItem>
#include <KInputDialog>
@@ -38,7 +39,9 @@
: QGraphicsView(UMLApp::app()->mainViewWidget()),
m_folder(parentFolder),
m_doc(UMLApp::app()->document()),
-m_scene(new UMLScene(m_folder, this))
+m_scene(new UMLScene(m_folder, this)),
+m_bShowSnapGrid(false),
+m_bUseSnapToGrid(false)
{
m_diagram = new Diagram(this);
@@ -376,7 +379,7 @@
break;
case ListPopupMenu::mt_Export_Image:
-// m_pImageExporter->exportView();
+ scene()->imageExporter()->exportView();
break;
case ListPopupMenu::mt_FloatText: {
@@ -536,17 +539,17 @@
break;
case ListPopupMenu::mt_SnapToGrid:
- //toggleSnapToGrid();
+ toggleSnapToGrid();
m_doc->setModified();
break;
case ListPopupMenu::mt_ShowSnapGrid:
-// toggleShowGrid();
+ toggleShowGrid();
m_doc->setModified();
break;
case ListPopupMenu::mt_Properties:
-// if (showPropDialog() == true)
+ if (scene()->showPropDialog() == true)
m_doc->setModified();
break;
@@ -573,8 +576,40 @@
}
+void UMLView::toggleShowGrid()
+{
+ setShowSnapGrid(!snapToGrid());
+}
+bool UMLView::snapToGrid()
+{
+ return m_bShowSnapGrid;
+}
+
+void UMLView::setSnapToGrid(bool bSnap)
+{
+ m_bUseSnapToGrid = bSnap;
+ emit sigSnapToGridToggled(m_scene->snapToGrid());
}
+void UMLView::setShowSnapGrid(bool bShow)
+{
+ m_bShowSnapGrid = bShow;
+ emit sigShowGridToggled(snapToGrid());
+}
+void UMLView::setSnapGridVisible(bool bShow)
+{
+ scene()->layoutGrid()->setVisible(bShow);
+ emit sigShowGridToggled(bShow);
+}
+
+void UMLView::toggleSnapToGrid()
+{
+ setSnapToGrid(!snapToGrid());
+}
+
+}
+
+
--- branches/work/soc-umbrello-2011/umbrello/soc-umbrello-2011/umlview.h #1246004:1246005
@@ -66,12 +66,25 @@
void setMenu(QPoint pos);
+ void setSnapToGrid(bool bSnap);
+ void setShowSnapGrid(bool bShow);
+ bool snapToGrid();
+ void setSnapGridVisible(bool bShow);
+ void toggleShowGrid();
+ void toggleSnapToGrid();
+
+
public slots:
void slotShowView();
void slotActivate();
void slotMenuSelection(QAction* action);
+ signals:
+ void sigShowGridToggled(bool);
+ void sigSnapToGridToggled(bool);
+
+
private:
QPointF m_pos;
UMLFolder *m_folder;
@@ -83,6 +96,7 @@
UMLDoc *m_doc;
ListPopupMenu *m_menu;
QPointF m_pastepoint;
+ bool m_bUseSnapToGrid, m_bShowSnapGrid;
};
--- branches/work/soc-umbrello-2011/umbrello/soc-umbrello-2011/umlwidget.cpp #1246004:1246005
@@ -246,16 +246,16 @@
void UMLWidget::constrain(qreal& width, qreal& height)
{
- const QSize minSize = calculateSize();
+ const QSizeF minSize = calculateSize();
if (width < minSize.width())
width = minSize.width();
if (height < minSize.height())
height = minSize.height();
}
-QSize UMLWidget::calculateSize()
+QSizeF UMLWidget::calculateSize()
{
- return QSize(20, 20);
+ return QSizeF(20, 20);
}
ListPopupMenu *UMLWidget::setupPopupMenu(ListPopupMenu* menu)
@@ -340,6 +340,9 @@
update();
}
+QRectF UMLWidget::rect() {
+ return QRectF(QPointF(0, 0), calculateSize());
+}
}
\ No newline at end of file
--- branches/work/soc-umbrello-2011/umbrello/soc-umbrello-2011/umlwidget.h #1246004:1246005
@@ -94,10 +94,11 @@
UMLView *view() const;
UMLWidgetController *widgetController() const;
ListPopupMenu *m_menu;
- QSize calculateSize();
+ QSizeF calculateSize();
void constrain(qreal& width, qreal& height);
ListPopupMenu *setupPopupMenu(ListPopupMenu* menu = 0);
bool UseFillColour();
+ QRectF rect();
public slots:
void slotRemovePopupMenu();
--- branches/work/soc-umbrello-2011/umbrello/toolbarstate.cpp #1246004:1246005
@@ -35,11 +35,11 @@
*/
ToolBarState::~ToolBarState()
{
- if(m_pMouseEvent != NULL)
- delete m_pMouseEvent;
+ //if(m_pMouseEvent != NULL)
+ //delete m_pMouseEvent;
#ifdef SOC2011
- if(m_pMouseEvent_new != NULL)
- delete m_pMouseEvent_new;
+ //if(m_pMouseEvent_new != NULL)
+ //delete m_pMouseEvent_new;
#endif
}
--- branches/work/soc-umbrello-2011/umbrello/widgets/widget_factory.cpp #1246004:1246005
@@ -67,8 +67,10 @@
#include "soc-umbrello-2011/umlscene.h"
#include "soc-umbrello-2011/umlwidget.h"
#include "soc-umbrello-2011/boxwidget.h"
+#include "soc-umbrello-2011/entitywidget.h"
#include "soc-umbrello-2011/objectwidget.h"
+
namespace Widget_Factory {
UMLWidget *createWidget(UMLView *view, UMLObject *o)
@@ -205,7 +207,7 @@
// newWidget = new EnumWidget(view, static_cast<UMLEnum*>(o));
break;
case Uml::ot_Entity:
-// newWidget = new EntityWidget(view, static_cast<UMLEntity*>(o));
+ newWidget = new QGV::EntityWidget(view, static_cast<UMLEntity*>(o));
break;
case Uml::ot_Interface:
// if (diagramType == Uml::dt_Sequence || diagramType == Uml::dt_Collaboration) {
More information about the umbrello-devel
mailing list