[Kuml-cvs] CVS: kuml/kuml_gui/src/ige/common/documents AbstractDocument.cpp,1.1.1.1,1.2 AbstractDocument.h,1.1.1.1,1.2 Document.h,1.1.1.1,1.2 StandardDocument.cpp,1.1.1.1,1.2 StandardDocument.h,1.1.1.1,1.2

[Darius S. <dst...@us...>]

Update of /cvsroot/kuml/kuml/kuml_gui/src/ige/common/documents
In directory usw-pr-cvs1:/tmp/cvs-serv28950/common/documents

Modified Files:
	AbstractDocument.cpp AbstractDocument.h Document.h 
	StandardDocument.cpp StandardDocument.h 
Log Message:
A Viewer can paint its layers now

Index: AbstractDocument.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/documents/AbstractDocument.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** AbstractDocument.cpp	2001/06/20 19:21:26	1.1.1.1
--- AbstractDocument.cpp	2001/07/20 15:57:29	1.2
***************
*** 18,33 ****
  
  #include "AbstractDocument.h"
  class Viewer;
  class QDialog;
  class QPopupMenu;
! class DataLayer;
! class GridLayer;
! class Layer;
! class BackgroundLayer;
  
  void AbstractDocument::setViewer(Viewer* viewer){
      this->viewer = viewer;
  }
  Viewer* AbstractDocument::getViewer(){
      return viewer;
  }
--- 18,52 ----
  
  #include "AbstractDocument.h"
+ #include <qglobal.h>
+ 
+ #include "ige/common/editors/DataLayer.h"
+ #include "ige/common/editors/GridLayer.h"
+ #include "ige/common/editors/BackgroundLayer.h"
+ 
  class Viewer;
  class QDialog;
  class QPopupMenu;
! //class DataLayer;
! //class GridLayer;
! //class Layer;
! //class BackgroundLayer;
  
  void AbstractDocument::setViewer(Viewer* viewer){
+ 	CHECK_PTR(viewer);
+ 
      this->viewer = viewer;
+ 
+ 	if(dataLayer);
+ 		dataLayer->setViewer(viewer);
+ 
+ 	if(backgroundLayer);
+ 		backgroundLayer->setViewer(viewer);
+ 
+ 	if(gridLayer);
+ 		gridLayer->setViewer(viewer);
  }
  Viewer* AbstractDocument::getViewer(){
+     CHECK_PTR(viewer);
+ 
      return viewer;
  }
***************
*** 44,51 ****
  AbstractDocument::~AbstractDocument(){
  }
! AbstractDocument::AbstractDocument(){
      backgroundLayer = 0;
      gridLayer = 0;
      dataLayer = 0;
  }
  void AbstractDocument::setTitle(string& title){
--- 63,71 ----
  AbstractDocument::~AbstractDocument(){
  }
! AbstractDocument::AbstractDocument(Viewer* viewer){
      backgroundLayer = 0;
      gridLayer = 0;
      dataLayer = 0;
+     this->viewer = viewer;
  }
  void AbstractDocument::setTitle(string& title){

Index: AbstractDocument.h
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/documents/AbstractDocument.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** AbstractDocument.h	2001/06/20 19:21:26	1.1.1.1
--- AbstractDocument.h	2001/07/20 15:57:29	1.2
***************
*** 32,36 ****
  class AbstractDocument : public Document {
  public:
! 	AbstractDocument();
  	virtual ~AbstractDocument();
      string& getLocation();
--- 32,36 ----
  class AbstractDocument : public Document {
  public:
! 	AbstractDocument(Viewer* viewer);
  	virtual ~AbstractDocument();
      string& getLocation();

Index: Document.h
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/documents/Document.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Document.h	2001/06/20 19:21:26	1.1.1.1
--- Document.h	2001/07/20 15:57:29	1.2
***************
*** 28,32 ****
  class GridLayer;
  
! /** @interface */
  class Document :  public GuiProvider {
  public:
--- 28,35 ----
  class GridLayer;
  
! /**
!   * A Document stores the 
!   * @interface
!   */
  class Document :  public GuiProvider {
  public:

Index: StandardDocument.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/documents/StandardDocument.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** StandardDocument.cpp	2001/06/20 19:21:26	1.1.1.1
--- StandardDocument.cpp	2001/07/20 15:57:29	1.2
***************
*** 25,36 ****
  void StandardDocument::paint(QPainter* p){}
  StandardDocument::~StandardDocument(){
!     delete dataLayer;
!     delete gridLayer;
!     delete backgroundLayer;
  }
! StandardDocument::StandardDocument() :dataLayer(0), gridLayer(0), backgroundLayer(0) {
!     dataLayer = new StandardDataLayer(getViewer());
!     gridLayer = new GridLayer(getViewer());
!     backgroundLayer = new BackgroundLayer(getViewer());
  }
  
--- 25,39 ----
  void StandardDocument::paint(QPainter* p){}
  StandardDocument::~StandardDocument(){
! 	if(dataLayer)
! 	    delete dataLayer;
! 	if(gridLayer)
! 	    delete gridLayer;
! 	if(backgroundLayer)
! 	    delete backgroundLayer;
  }
! StandardDocument::StandardDocument(Viewer* viewer) : AbstractDocument(viewer) {
!     dataLayer = new StandardDataLayer(viewer);
!     gridLayer = new GridLayer(viewer);
!     backgroundLayer = new BackgroundLayer(viewer);
  }
  

Index: StandardDocument.h
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/documents/StandardDocument.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** StandardDocument.h	2001/06/20 19:21:26	1.1.1.1
--- StandardDocument.h	2001/07/20 15:57:29	1.2
***************
*** 28,32 ****
  public:    
  
!     StandardDocument();    
  
      virtual ~StandardDocument();    
--- 28,32 ----
  public:    
  
!     StandardDocument(Viewer* viewer);    
  
      virtual ~StandardDocument();    
***************
*** 40,50 ****
  
      /** @link aggregation */
!     StandardDataLayer *dataLayer;
  
      /** @link aggregation */
!     GridLayer *gridLayer;
  
      /** @link aggregation */
!     BackgroundLayer *backgroundLayer;
  };
  
--- 40,50 ----
  
      /** @link aggregation */
! //    StandardDataLayer *dataLayer;
  
      /** @link aggregation */
! //    GridLayer *gridLayer;
  
      /** @link aggregation */
! //    BackgroundLayer *backgroundLayer;
  };