[Kuml-cvs] CVS: kuml_old/kuml/drawobj drawingclass.cpp,1.1.1.1,1.2 drawingclass.h,1.1.1.1,1.2 drawingrect.cpp,1.1.1.1,1.2

[Gerard F. <ger...@us...>]

Update of /cvsroot/kuml/kuml_old/kuml/drawobj
In directory usw-pr-cvs1:/tmp/cvs-serv1995/kuml/drawobj

Modified Files:
	drawingclass.cpp drawingclass.h drawingrect.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: drawingclass.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/drawobj/drawingclass.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** drawingclass.cpp	8 Oct 2000 04:22:44 -0000	1.1.1.1
--- drawingclass.cpp	17 Mar 2002 22:56:28 -0000	1.2
***************
*** 69,104 ****
    while((type = stream.readStatement()) != IOKumlUtility::CloseGroup) {
      switch(type) {
!       case IOKumlUtility::GroupItem:
!         if(stream.getGroupType() == "class") {
!           getClass()->readAsKuml(stream);
!           continue;
!         }
!         if(stream.getGroupType() == "drawingrect") {
!           DrawingRect::readAsKuml(stream);
!           continue;
!         }
  
!         debug("DrawingClass::readAsKuml(): Unrecognized group found !");
!         stream.skipGroup();         // Skip the unrecognized group
!         break;
! 
!       case IOKumlUtility::Assignment:
!         if(stream.getAssignmentName() == "Autosize") {
! // Darius: Moved to DrawingItem
! //          if(stream.getAssignmentValue() == "true")
! //            setAutosize("true");
!           continue;
!         }
! /*        if(stream.getAssignmentName() == "Superclass") {
!           dcl = (DrawingClass*)getDrawingArea()->getDiagram()->getItemByLabel(stream.getAssignmentValue());
!           cl->addSuperClass(dcl->getClass());
!           continue;
          }*/
!         debug("DrawingClass::readAsKuml(): Unknown assignment found ! Ignored ...");
!         break;
! 
!       case IOKumlUtility::Error:
!         debug("DrawingClass::readAsKuml(): Parse error !");
!         break;
      }
    } // end of while
--- 69,107 ----
    while((type = stream.readStatement()) != IOKumlUtility::CloseGroup) {
      switch(type) {
!     case IOKumlUtility::GroupItem:
!       if(stream.getGroupType() == "class") {
! 	debug( QString( "DrawingClass::readAsKuml, class name:" ) +
! 	       stream.getGroupName() );
! 	cl = new Classes( stream.getGroupName() );
! 	cl->readAsKuml(stream);
! 	continue;
!       }
!       if(stream.getGroupType() == "drawingrect") {
! 	DrawingRect::readAsKuml(stream);
! 	continue;
!       }
  
!       debug("DrawingClass::readAsKuml(): Unrecognized group found !");
!       stream.skipGroup();         // Skip the unrecognized group
!       break;
! 
!     case IOKumlUtility::Assignment:
!       if(stream.getAssignmentName() == "Autosize") {
! 	// Darius: Moved to DrawingItem
! 	//          if(stream.getAssignmentValue() == "true")
! 	//            setAutosize("true");
! 	continue;
!       }
!       /*        if(stream.getAssignmentName() == "Superclass") {
! 		dcl = (DrawingClass*)getDrawingArea()->getDiagram()->getItemByLabel(stream.getAssignmentValue());
! 		cl->addSuperClass(dcl->getClass());
! 		continue;
          }*/
!       debug("DrawingClass::readAsKuml(): Unknown assignment found ! Ignored ...");
!       break;
!       
!     case IOKumlUtility::Error:
!       debug("DrawingClass::readAsKuml(): Parse error !");
!       break;
      }
    } // end of while
***************
*** 722,726 ****
  ////////////////////////////////////////////////////////////////////////
  DrawingClass::DrawingClass(QObject *parent, Classes* cls, DrawingArea *area)
!                            : DrawingRect(parent, area, "") {
    cl = cls;
    offsetFromTop = 0;
--- 725,729 ----
  ////////////////////////////////////////////////////////////////////////
  DrawingClass::DrawingClass(QObject *parent, Classes* cls, DrawingArea *area)
!   : DrawingRect(parent, area, "") {
    cl = cls;
    offsetFromTop = 0;

Index: drawingclass.h
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/drawobj/drawingclass.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** drawingclass.h	8 Oct 2000 04:22:44 -0000	1.1.1.1
--- drawingclass.h	17 Mar 2002 22:56:28 -0000	1.2
***************
*** 42,48 ****
  	  */
  	enum DetailLevel { DisableAutoDetails         = 1,
! 										 DetailsSuppressed          = 2,
! 										 AnalysisLevelDetails       = 3,
! 										 ImplementationLevelDetails = 4 };
  										
  	
--- 42,48 ----
  	  */
  	enum DetailLevel { DisableAutoDetails         = 1,
! 			   DetailsSuppressed          = 2,
! 			   AnalysisLevelDetails       = 3,
! 			   ImplementationLevelDetails = 4 };
  										
  	
***************
*** 59,62 ****
--- 59,63 ----
  	
  	DrawingClass(QObject *parent, Classes* cls, DrawingArea *area);
+ 
  	DrawingClass(QObject *parent, Classes* cls, DrawingArea *area, int x, int y);
  
***************
*** 67,71 ****
  
  	/** Open the edit dialog for this item */
!   virtual bool showPropertiesDialog(QWidget *parent);
  
  //	virtual QString getLabel();
--- 68,72 ----
  
  	/** Open the edit dialog for this item */
! 	virtual bool showPropertiesDialog(QWidget *parent);
  
  //	virtual QString getLabel();
***************
*** 74,78 ****
  	Classes* getClass() { return cl; }
  
!   void setClass(Classes* value) { cl = value; doAutoResize(getDrawingArea()); }
  
    /**
--- 75,79 ----
  	Classes* getClass() { return cl; }
  
! 	void setClass(Classes* value) { cl = value; doAutoResize(getDrawingArea()); }
  
    /**

Index: drawingrect.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/drawobj/drawingrect.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** drawingrect.cpp	8 Oct 2000 04:22:52 -0000	1.1.1.1
--- drawingrect.cpp	17 Mar 2002 22:56:28 -0000	1.2
***************
*** 78,81 ****
--- 78,83 ----
  
        case IOKumlUtility::Assignment:
+ 	debug( "DrawingRect::readAsKuml, handling Assignment:" );
+ 	debug( stream.getAssignmentName() );
          if(stream.getAssignmentName() == "Shadow") {
            if(stream.getAssignmentValue() == "true")
***************
*** 94,97 ****
--- 96,101 ----
          }
          if(stream.getAssignmentName() == "Width") {
+ 	  debug( "Setting width:" );
+ 	  cerr << "   " << stream.getAssignmentValueAsInt() << endl;
            setWidth(stream.getAssignmentValueAsInt());
            continue;
***************
*** 628,630 ****
  
  }
! ////////////////////////////////////////////////////////////////////////
\ No newline at end of file
--- 632,634 ----
  
  }
! ////////////////////////////////////////////////////////////////////////