Menu
▾
▴
[Kuml-cvs] CVS: kuml_old/kuml/diagrams diagram.cpp,1.1.1.1,1.2 diagramloader.cpp,1.1.1.1,1.2
|
From: Gerard F. <ger...@us...> - 2002-03-03 22:03:44
|
Update of /cvsroot/kuml/kuml_old/kuml/diagrams
In directory usw-pr-cvs1:/tmp/cvs-serv2699/kuml/diagrams
Modified Files:
diagram.cpp diagramloader.cpp
Log Message:
2002-03-03 Gerard Flynn <ger...@li...>
* iokumlutility.cpp fixed parsing problem in readStatement
* kuml.cpp commented PopUp warnings for save/restore functions
VS: Committing in .
VS:
VS: Modified Files:
VS: ChangeLog kuml/iokumlutility.cpp kuml/kuml.cpp kuml/resource.h
VS: kuml/diagrams/diagram.cpp kuml/diagrams/diagramloader.cpp
VS: ----------------------------------------------------------------------
Index: diagram.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/diagrams/diagram.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** diagram.cpp 8 Oct 2000 04:22:25 -0000 1.1.1.1
--- diagram.cpp 3 Mar 2002 22:03:41 -0000 1.2
***************
*** 56,59 ****
--- 56,60 ----
void Diagram::writeAllItemsAsKuml(IOKumlUtility &stream, int filter) {
// Write all operations
+ debug( "Call to Diagram::writeAllItemsAsKuml" );
ListOfDrawingItemsIterator iter(listOfDrawingItems);
for(unsigned int i = 0; i < iter.count(); i++) {
***************
*** 65,68 ****
--- 66,71 ----
////////////////////////////////////////////////////////////////////////
void Diagram::writeAsKuml(IOKumlUtility &stream) {
+
+ debug( "Call to Diagram::writeAsKuml" );
stream.writeGroupItem("diagram", getNameDiagram());
#if !defined (KDE2)
***************
*** 85,91 ****
--- 88,99 ----
name;
int type;
+
+ debug( "Call to Diagram::readAsKuml" );
+
while((type = stream.readStatement()) != IOKumlUtility::CloseGroup) {
+ debug( "Diagram::readAsKuml in while loop" );
switch(type) {
case IOKumlUtility::Assignment:
+ debug( "Diagram::readAsKuml handling assignment" );
value = stream.getAssignmentValue();
name = stream.getAssignmentName();
***************
*** 109,113 ****
--- 117,124 ----
case IOKumlUtility::GroupItem:
+ debug( "Diagram::readAsKuml handling GroupItem : " );
+ debug( stream.getGroupType() );
if(stream.getGroupType() == "drawingrectangle") {
+ debug( "Diagram::readAsKuml handling drawingrectangle" );
item = new DrawingRectangle(NULL, getPtrDrawingArea());
item->setLabel(stream.getGroupName());
***************
*** 117,120 ****
--- 128,132 ----
}
if(stream.getGroupType() == "drawingtext") {
+ debug( "Diagram::readAsKuml handling drawingtext" );
item = new DrawingText(NULL, getPtrDrawingArea());
item->setLabel(stream.getGroupName());
***************
*** 124,127 ****
--- 136,140 ----
}
if(stream.getGroupType() == "drawingtextnotelink") {
+ debug( "Diagram::readAsKuml handling drawingtextnotelink" );
item = new DrawingTextnoteLink(NULL, getPtrDrawingArea());
item->setLabel(stream.getGroupName());
***************
*** 606,608 ****
}
! ////////////////////////////////////////////////////////////////////////
\ No newline at end of file
--- 619,621 ----
}
! ////////////////////////////////////////////////////////////////////////
Index: diagramloader.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/diagrams/diagramloader.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** diagramloader.cpp 8 Oct 2000 04:22:25 -0000 1.1.1.1
--- diagramloader.cpp 3 Mar 2002 22:03:41 -0000 1.2
***************
*** 50,53 ****
--- 50,55 ----
Diagram* DiagramLoader::load(const QString& filename, WinOverView *overview) {
+ debug("Call to DiagramLoader::load.");
+
QFile file(filename);
if(file.open(IO_ReadOnly) == false) {
***************
*** 70,73 ****
--- 72,77 ----
#if !defined (EXPERIMENTAL_PERSISTENCE)
+ debug("DiagramLoader::load : non-experimental section.");
+
// Create the diagram by given diagram name as string
DiagramFactory factory(area);
***************
*** 79,84 ****
--- 83,92 ----
}
+ debug("DiagramLoader::load : after diagram creation");
+
area->slotSetDiagram(diagram);
+ debug("DiagramLoader::load : after slotSetDiagram");
+
***************
*** 87,91 ****
DlgNewDiagram *newdialog = new DlgNewDiagram((QWidget*)0,"Create new diagram", getPtrDrawingArea());
! connect(newdialog, SIGNAL(sigNewDiagram(Diagram*)), getPtrDrawingArea(), SLOT(slotSetDiagram(Diagram*)));
if(newdialog->exec()) {
--- 95,100 ----
DlgNewDiagram *newdialog = new DlgNewDiagram((QWidget*)0,"Create new diagram", getPtrDrawingArea());
! connect(newdialog, SIGNAL(sigNewDiagram(Diagram*)),
! getPtrDrawingArea(), SLOT(slotSetDiagram(Diagram*)));
if(newdialog->exec()) {
***************
*** 102,106 ****
show();
! connect(listviewitem, SIGNAL(sigSetDiagram(Diagram*)), getPtrDrawingArea(), SLOT(slotSetDiagram(Diagram*)));
listviewitem->setOpen(true);*/
--- 111,116 ----
show();
! connect(listviewitem, SIGNAL(sigSetDiagram(Diagram*)),
! getPtrDrawingArea(), SLOT(slotSetDiagram(Diagram*)));
listviewitem->setOpen(true);*/
***************
*** 115,123 ****
overview->setSelected(listviewitem, true);
diagram->setLVI(listviewitem);
! connect(listviewitem, SIGNAL(sigSetDiagram(Diagram*)), getDrawingArea(), SLOT(slotSetDiagram(Diagram*)));
listviewitem->setOpen(true);
}
diagram->readAsKuml(utilstream);
if(overview) {
// Larry Anderson : commented out the following line and changed the next from
--- 125,138 ----
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
***************
*** 130,133 ****
--- 145,150 ----
// getDrawingArea()->getMainApp()->toolbox->enable(KToolBar::Show);
}
+
+ debug("DiagramLoader::load : before area->show");
area->show();
// Larry Anderson : added the following
|
