|
From: Gerard F. <ger...@us...> - 2002-03-17 22:56:32
|
Update of /cvsroot/kuml/kuml_old/kuml/diagrams
In directory usw-pr-cvs1:/tmp/cvs-serv1995/kuml/diagrams
Modified Files:
diagram.cpp diagramloader.cpp
Log Message:
2002-03-17 Gerard Flynn <ger...@li...>
* save/load of classes in class diagrams now works, connexions still
broken
* added loaded classes to the "project" package (multiple packages are
not supported at this time)
* changed the initial sizes of the 2 halfs of the kUML screen so that
most space is reserved for the diagram (KumlApp::initView)
* changed Classes::writeAsKuml to output the class name
* added loading of drawingclass to Diagram::readAsKuml
VS: Committing in .
VS:
VS: Modified Files:
VS: ChangeLog kuml/iokumlutility.cpp kuml/kuml.cpp
VS: kuml/kumlview.cpp kuml/kumlview.h kuml/data/classes.cpp
VS: kuml/data/element.cpp kuml/data/package.cpp
VS: kuml/data/repository.cpp kuml/diagrams/diagram.cpp
VS: kuml/diagrams/diagramloader.cpp kuml/drawobj/drawingclass.cpp
VS: kuml/drawobj/drawingclass.h kuml/drawobj/drawingrect.cpp
VS: kuml/overview/winoverview.cpp
VS: ----------------------------------------------------------------------
Index: diagram.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/diagrams/diagram.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** diagram.cpp 3 Mar 2002 22:03:41 -0000 1.2
--- diagram.cpp 17 Mar 2002 22:56:28 -0000 1.3
***************
*** 20,23 ****
--- 20,24 ----
//#include<typeinfo>
#include "../drawobj/drawingconnection.h"
+ #include "../drawobj/drawinggeneralization.h"
#include "../drawobj/drawingrectangle.h"
#include "../drawobj/drawingtext.h"
***************
*** 143,149 ****
continue;
}
debug("Diagram::readAsKuml(): Unrecognized group found !");
! // stream.skipGroup(); // Skip the unrecognized group
break;
--- 144,171 ----
continue;
}
+ //*********************************************************
+ // Added 2002-03-10 by Gerard Flynn.
+ if( stream.getGroupType() == "drawingclass" ) {
+ debug( "Diagram::readAsKuml handling drawingclass" );
+ item = new DrawingClass( NULL, NULL, getPtrDrawingArea() );
+ item->setLabel( stream.getGroupName() );
+ // item->setAutoRepaint( true );
+ item->readAsKuml( stream );
+ // dynamic_cast<DrawingRect*>( item )->setWidth( 300 );
+ addDrawingItem( item );
+ continue;
+ }
+ if( stream.getGroupType() == "drawinggeneralization" ) {
+ debug( "Diagram::readAsKuml handling drawinggeneralization" );
+ item = new DrawingGeneralization( NULL,
+ getPtrDrawingArea(),
+ stream.getGroupName() );
+ item->readAsKuml( stream );
+ addDrawingItem( item );
+ }
+ //*********************************************************
debug("Diagram::readAsKuml(): Unrecognized group found !");
! stream.skipGroup(); // Skip the unrecognized group
break;
***************
*** 285,289 ****
DrawingItem* Diagram::getItemByLabel(const QString& itemlabel) {
ListOfDrawingItemsIterator iter(listOfDrawingItems);
! for(iter.toFirst() ; iter.current() ; ++iter)
if(iter.current()->getLabel() == itemlabel)
return iter.current();
--- 307,311 ----
DrawingItem* Diagram::getItemByLabel(const QString& itemlabel) {
ListOfDrawingItemsIterator iter(listOfDrawingItems);
! for(iter.toFirst() ; iter.current() ; ++iter)
if(iter.current()->getLabel() == itemlabel)
return iter.current();
***************
*** 420,433 ****
////////////////////////////////////////////////////////////////////////
void Diagram::addDrawingItem(DrawingItem* item) {
! if(item->isConnection())
listOfDrawingItems.insert(0, item);
else
listOfDrawingItems.append(item);
!
! if(item->isAutoResize())
! item->doAutoResize(getPtrDrawingArea());
!
! if(item->isAutoRepaint() && !item->isAutoResize())
! getPtrDrawingArea()->repaint(item->getUpdateRect(), false);
}
--- 442,455 ----
////////////////////////////////////////////////////////////////////////
void Diagram::addDrawingItem(DrawingItem* item) {
! if(item->isConnection())
listOfDrawingItems.insert(0, item);
else
listOfDrawingItems.append(item);
!
! if(item->isAutoResize())
! item->doAutoResize(getPtrDrawingArea());
!
! if(item->isAutoRepaint() && !item->isAutoResize())
! getPtrDrawingArea()->repaint(item->getUpdateRect(), false);
}
Index: diagramloader.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/diagrams/diagramloader.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** diagramloader.cpp 3 Mar 2002 22:03:41 -0000 1.2
--- diagramloader.cpp 17 Mar 2002 22:56:28 -0000 1.3
***************
*** 74,77 ****
--- 74,78 ----
debug("DiagramLoader::load : non-experimental section.");
+ debug( QString( "Group type: " + utilstream.getGroupType() ) );
// Create the diagram by given diagram name as string
DiagramFactory factory(area);
***************
*** 119,139 ****
if(overview) {
LVIDiagrams *listviewitem = NULL;
! DiagramLVIFactory lviFactory(overview->getLVIForDiagram(diagram));
! listviewitem = lviFactory.createLVI(diagram);
!
! // Overview
overview->setSelected(listviewitem, true);
diagram->setLVI(listviewitem);
! connect(listviewitem, SIGNAL(sigSetDiagram(Diagram*)),
! getDrawingArea(), SLOT(slotSetDiagram(Diagram*)));
listviewitem->setOpen(true);
}
debug("DiagramLoader::load : before diagram->readAsKuml");
!
diagram->readAsKuml(utilstream);
debug("DiagramLoader::load : after diagram->readAsKuml");
! if(overview) {
// Larry Anderson : commented out the following line and changed the next from
// getDraingArea() to area
--- 120,140 ----
if(overview) {
LVIDiagrams *listviewitem = NULL;
! DiagramLVIFactory lviFactory(overview->getLVIForDiagram(diagram));
! listviewitem = lviFactory.createLVI(diagram);
!
! // Overview
overview->setSelected(listviewitem, true);
diagram->setLVI(listviewitem);
! connect(listviewitem, SIGNAL(sigSetDiagram(Diagram*)),
! getDrawingArea(), SLOT(slotSetDiagram(Diagram*)));
listviewitem->setOpen(true);
}
debug("DiagramLoader::load : before diagram->readAsKuml");
!
diagram->readAsKuml(utilstream);
debug("DiagramLoader::load : after diagram->readAsKuml");
! if(overview) {
// Larry Anderson : commented out the following line and changed the next from
// getDraingArea() to area
***************
*** 142,147 ****
// Fill the toolbox with items of the diagram
! // diagram->fillToolBox(getDrawingArea()->getMainApp()->toolbox);
! // getDrawingArea()->getMainApp()->toolbox->enable(KToolBar::Show);
}
--- 143,148 ----
// Fill the toolbox with items of the diagram
! // diagram->fillToolBox(getDrawingArea()->getMainApp()->toolbox);
! // getDrawingArea()->getMainApp()->toolbox->enable(KToolBar::Show);
}
***************
*** 150,154 ****
// Larry Anderson : added the following
area->getMainApp()->show();
!
--- 151,155 ----
// Larry Anderson : added the following
area->getMainApp()->show();
!
|