[Kuml-cvs] CVS: kuml/kuml_gui/src/ige/common/editors AbstractEditor.cpp,1.2,1.3 AbstractLayer.cpp,1.

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	AbstractEditor.cpp AbstractLayer.cpp AbstractLayer.h 
	BackgroundLayer.cpp BackgroundLayer.h DataLayer.cpp 
	DataLayer.h DoubleBufferViewer.cpp GridLayer.cpp GridLayer.h 
	Layer.h LayerPlacer.cpp LayerStack.cpp LayerStack.h 
	ManipulationLayer.cpp ManipulationLayer.h SelectionLayer.cpp 
	SelectionLayer.h StandardDataLayer.cpp StandardEditor.cpp 
	StandardManipulationLayer.cpp StandardManipulationLayer.h 
	StandardSelectionLayer.cpp StandardSelectionLayer.h 
Log Message:
A Viewer can paint its layers now

Index: AbstractEditor.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/editors/AbstractEditor.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** AbstractEditor.cpp	2001/07/18 14:19:31	1.2
--- AbstractEditor.cpp	2001/07/20 15:57:29	1.3
***************
*** 20,23 ****
--- 20,26 ----
  #include "Viewer.h"
  #include "ige/common/manipulators/ViewManipulator.h"
+ #include "ige/common/editors/StandardSelectionLayer.h"
+ #include "ige/common/editors/StandardManipulationLayer.h"
+ 
  class EditorCommand;
  class Tool;
***************
*** 42,45 ****
--- 45,50 ----

      setViewer(v);
+ 	v->addLayer(new StandardSelectionLayer(v));
+ 	v->addLayer(new StandardManipulationLayer(v));
  }

***************
*** 71,74 ****
--- 76,80 ----
  void AbstractEditor::setTool(Tool * tool) {
      this->tool = tool;
+ 	qDebug(string("Editor's current tool: " + tool->getDescription()).c_str());
  }
  Tool* AbstractEditor::getTool() {
***************
*** 93,97 ****
      CHECK_PTR(cmd);

! 	debug(string("Editor is executing command: " + cmd->getDescription()).c_str());

      cmd->execute(this);
--- 99,103 ----
      CHECK_PTR(cmd);

! 	qDebug(string("Editor is executing command: " + cmd->getDescription()).c_str());

      cmd->execute(this);
***************
*** 104,108 ****
      CHECK_PTR(cmd);

!     debug(string("Editor is undoing command: " + cmd->getDescription()).c_str());
      cmd->undo();
      delete cmd;
--- 110,114 ----
      CHECK_PTR(cmd);

!     qDebug(string("Editor is undoing command: " + cmd->getDescription()).c_str());
      cmd->undo();
      delete cmd;

Index: AbstractLayer.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/editors/AbstractLayer.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** AbstractLayer.cpp	2001/06/20 19:21:19	1.1.1.1
--- AbstractLayer.cpp	2001/07/20 15:57:29	1.2
***************
*** 18,29 ****

  #include "AbstractLayer.h"

  AbstractLayer::AbstractLayer(Viewer* v) {
      viewer = v;
  }
  AbstractLayer::~AbstractLayer(){}
  void AbstractLayer::paint(QPainter* p){}
! void AbstractLayer::setHidden(bool s){}
! bool AbstractLayer::isHidden(){}
  void AbstractLayer::setViewer(Viewer* viewer){ this->viewer = viewer; }
  Viewer* AbstractLayer::getViewer(){ return viewer; }
--- 18,32 ----

  #include "AbstractLayer.h"
+ #include <qglobal.h>

  AbstractLayer::AbstractLayer(Viewer* v) {
+     CHECK_PTR(v);
      viewer = v;
+     hidden = false;
  }
  AbstractLayer::~AbstractLayer(){}
  void AbstractLayer::paint(QPainter* p){}
! void AbstractLayer::setHidden(bool s) { hidden = s; }
! bool AbstractLayer::isHidden(){ return hidden; }
  void AbstractLayer::setViewer(Viewer* viewer){ this->viewer = viewer; }
  Viewer* AbstractLayer::getViewer(){ return viewer; }

Index: AbstractLayer.h
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/editors/AbstractLayer.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** AbstractLayer.h	2001/06/20 19:21:17	1.1.1.1
--- AbstractLayer.h	2001/07/20 15:57:29	1.2
***************
*** 40,43 ****
--- 40,47 ----
      virtual void paint(QPainter* p);

+ 	virtual bool isAbove (Layer *other) {
+ 		return true;
+ 	}
+ 
  private:
      Viewer* viewer;

Index: BackgroundLayer.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/editors/BackgroundLayer.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** BackgroundLayer.cpp	2001/06/20 19:21:20	1.1.1.1
--- BackgroundLayer.cpp	2001/07/20 15:57:29	1.2
***************
*** 20,26 ****
  #include "Viewer.h"
  #include "LayerVisitor.h"
- 
  #include <qpainter.h>

  void BackgroundLayer::accept(LayerVisitor * visitor){
          visitor->visitBackgroundLayer(this);
--- 20,30 ----
  #include "Viewer.h"
  #include "LayerVisitor.h"
  #include <qpainter.h>

+ bool BackgroundLayer::isAbove (Layer *other) {
+ 		// The background layer is the lowest layer in the stack
+ 		return false;
+ }
+ 
  void BackgroundLayer::accept(LayerVisitor * visitor){
          visitor->visitBackgroundLayer(this);
***************
*** 29,36 ****
  }
  BackgroundLayer::BackgroundLayer(Viewer* v) : AbstractLayer(v) {
  }
  void BackgroundLayer::paint(QPainter * p) {
!     p->eraseRect(0,0,getViewer()->getWidth(),getViewer()->getHeight());
!     debug("BackgroundLayer painted");

  }
--- 33,48 ----
  }
  BackgroundLayer::BackgroundLayer(Viewer* v) : AbstractLayer(v) {
+ 	    qDebug("BackgroundLayer created");
  }
  void BackgroundLayer::paint(QPainter * p) {
! 	CHECK_PTR(getViewer());
! 
! 	int w = getViewer()->getWidth();
! 	int h = getViewer()->getHeight();
!     p->eraseRect(0,0,w,h);

+ 	p->fillRect(10,10,200,50, Qt::white);
+ 	p->drawRect(10,10,200,50);
+ 	p->drawText(30,40, "Background layer");
+ //    debug("BackgroundLayer painted");
  }

Index: BackgroundLayer.h
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/editors/BackgroundLayer.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** BackgroundLayer.h	2001/06/20 19:21:17	1.1.1.1
--- BackgroundLayer.h	2001/07/20 15:57:29	1.2
***************
*** 38,41 ****
--- 38,46 ----
       */
      virtual void accept(LayerVisitor * visitor);
+ 
+ 	/**
+ 	 *
+ 	 */
+ 	virtual bool isAbove(Layer *other);
  };
  #endif //BACKGROUNDLAYER_H

Index: DataLayer.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/editors/DataLayer.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** DataLayer.cpp	2001/06/20 19:21:20	1.1.1.1
--- DataLayer.cpp	2001/07/20 15:57:29	1.2
***************
*** 19,25 ****
--- 19,35 ----
  #include "DataLayer.h"
  #include "LayerVisitor.h"
+ #include "LayerChecker.h"

  #include "ige/typedefs.h"

+ bool DataLayer::isAbove (Layer *other) {
+ 		LayerChecker checker;
+ 
+ 		// The data layer is above the background layer
+ 		if(checker.isBackgroundLayer(other) || checker.isGridLayer(other))
+ 			return true;
+ 		else
+ 			return false;
+ }
  void DataLayer::accept(LayerVisitor * visitor){
          visitor->visitDataLayer(this);
***************
*** 27,30 ****
--- 37,41 ----
  DataLayer::~DataLayer(){}
  DataLayer::DataLayer(Viewer* v) : AbstractLayer(v) {
+ 	    qDebug("DataLayer created");
  }
  ViewMapIter DataLayer::getDataIterator(){

Index: DataLayer.h
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/editors/DataLayer.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** DataLayer.h	2001/06/20 19:21:18	1.1.1.1
--- DataLayer.h	2001/07/20 15:57:29	1.2
***************
*** 41,44 ****
--- 41,46 ----
       */
      virtual void accept(LayerVisitor * visitor);
+ 
+ 	virtual bool isAbove(Layer *other);
  };
  #endif //DATALAYER_H

Index: DoubleBufferViewer.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/editors/DoubleBufferViewer.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** DoubleBufferViewer.cpp	2001/06/20 19:21:19	1.1.1.1
--- DoubleBufferViewer.cpp	2001/07/20 15:57:29	1.2
***************
*** 28,32 ****
  }
  DoubleBufferViewer::DoubleBufferViewer(QWidget* parent) : AbstractViewer(parent) {
!     debug("DoubleBufferViewer created");
  }
  void DoubleBufferViewer::paintEvent(QPaintEvent *e) {
--- 28,32 ----
  }
  DoubleBufferViewer::DoubleBufferViewer(QWidget* parent) : AbstractViewer(parent) {
!     qDebug("DoubleBufferViewer created");
  }
  void DoubleBufferViewer::paintEvent(QPaintEvent *e) {

Index: GridLayer.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/editors/GridLayer.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** GridLayer.cpp	2001/06/20 19:21:20	1.1.1.1
--- GridLayer.cpp	2001/07/20 15:57:29	1.2
***************
*** 18,25 ****
--- 18,35 ----

  #include "GridLayer.h"
+ #include "LayerChecker.h"
  #include "Viewer.h"
  #include <qpainter.h>
  #include "LayerVisitor.h"

+ bool GridLayer::isAbove (Layer *other) {
+ 		LayerChecker checker;
+ 
+ 		// The grid layer is above the background layer
+ 		if(checker.isBackgroundLayer(other))
+ 			return true;
+ 		else
+ 			return false;
+ }
  void GridLayer::accept(LayerVisitor * visitor){
          visitor->visitGridLayer(this);
***************
*** 28,32 ****
  }
  GridLayer::GridLayer(Viewer* v) : AbstractLayer(v) {
!     debug("GridLayer created");
  }
  void GridLayer::paint(QPainter* p) {
--- 38,44 ----
  }
  GridLayer::GridLayer(Viewer* v) : AbstractLayer(v) {
!     qDebug("GridLayer created");
! 	_gridX = 50;
! 	_gridY = 50;
  }
  void GridLayer::paint(QPainter* p) {
***************
*** 34,48 ****

    // I will check this tomorrow
!   int gridx = 50;
!   int gridy = 50;
    int width = getViewer()->getWidth();
    int height = getViewer()->getHeight();
- 
- //  int width = 600;
- //  int height = 600;

!   for (x = 0; x < width; x+=gridx)
!     for (y = 0; y < height; y+=gridy)
        p->drawPoint(x,y);
!     debug("GridLayer painted");
  }
--- 46,62 ----

    // I will check this tomorrow
!   int gridx = getGridX();
!   int gridy = getGridY();
    int width = getViewer()->getWidth();
    int height = getViewer()->getHeight();

!   for (x = gridx; x < width; x+=gridx)
!     for (y = gridy; y < height; y+=gridy)
        p->drawPoint(x,y);
! 
! 	p->fillRect(60,50,200,50, Qt::white);
! 	p->drawRect(60,50,200,50);
! 	p->drawText(80,80, "Grid layer");
! 
! //    debug("GridLayer painted");
  }

Index: GridLayer.h
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/editors/GridLayer.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** GridLayer.h	2001/06/20 19:21:17	1.1.1.1
--- GridLayer.h	2001/07/20 15:57:29	1.2
***************
*** 39,42 ****
--- 39,64 ----
       */
      virtual void accept(LayerVisitor * visitor);
+ 
+ 		int getGridX() {
+ 			return _gridX;
+ 		}
+ 
+ 		int getGridY() {
+ 			return _gridY;
+ 		}
+ 
+ 		void setGridY(int g) {
+ 			_gridY = g;
+ 		}
+ 
+ 		void setGridX(int g) {
+ 			_gridX = g;
+ 		}
+ 
+ 	virtual bool isAbove(Layer *other);
+ 
+ 	private:
+ 		int _gridX;
+ 		int _gridY;
  };
  #endif //GRIDLAYER_H

Index: Layer.h
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/editors/Layer.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Layer.h	2001/06/20 19:21:18	1.1.1.1
--- Layer.h	2001/07/20 15:57:29	1.2
***************
*** 47,50 ****
--- 47,53 ----

      virtual string getName() = 0;
+ 
+ 	virtual bool isAbove (Layer *other) = 0;
+ 
  };
  #endif //LAYER_H

Index: LayerPlacer.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/editors/LayerPlacer.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** LayerPlacer.cpp	2001/06/20 19:21:17	1.1.1.1
--- LayerPlacer.cpp	2001/07/20 15:57:29	1.2
***************
*** 33,43 ****
  }
  void LayerPlacer::visitDataLayer(DataLayer * layer){
! 		LayerChecker checker;

  		vector<Layer*>::iterator iter = stack->layers.end();

  		while( iter != stack->layers.begin()) {
! 				// Test if there is already a data layer in the stack
!     		if(checker.isDataLayer(*iter)) {
  						// Replace the old data layer
  						stack->layers.erase(iter);
--- 33,51 ----
  }
  void LayerPlacer::visitDataLayer(DataLayer * layer){
! 	// This won't work as the accept function of the data layer will be called recursivly

+ 		Layer *l = 0;
  		vector<Layer*>::iterator iter = stack->layers.end();

  		while( iter != stack->layers.begin()) {
!               if(*iter < l) {
! 				stack->layers.insert(iter+1, (Layer*)layer);
! 				break;
! 			}			
! 			--iter;		
! 		}				
! 			
! 			// Test if there already is a data layer in the stack
! /*	    		if(checker.isDataLayer(*iter)) {
  						// Replace the old data layer
  						stack->layers.erase(iter);
***************
*** 45,48 ****
--- 53,57 ----
  						break;
  				}
+ 		

  				// If there is a grid layer insert the data layer above it
***************
*** 60,64 ****

  		// If there aren't either a grid or background layer insert the data layer at the bottom
! 		stack->layers.insert(stack->layers.begin(), (Layer*)layer);
  }
  void LayerPlacer::visitGridLayer(GridLayer * layer){
--- 69,74 ----

  		// If there aren't either a grid or background layer insert the data layer at the bottom
! 		stack->layers.insert(stack->layers.begin(), (Layer*)layer);*/
! 
  }
  void LayerPlacer::visitGridLayer(GridLayer * layer){

Index: LayerStack.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/editors/LayerStack.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** LayerStack.cpp	2001/06/20 19:21:21	1.1.1.1
--- LayerStack.cpp	2001/07/20 15:57:29	1.2
***************
*** 97,102 ****
  }
  void LayerStack::add(Layer* l){
! 	LayerPlacer placer(this);
! 	l->accept(&placer);
  }
  void LayerStack::paint(QPainter* p){
--- 97,141 ----
  }
  void LayerStack::add(Layer* l){
! 	bool inserted = false;
! /*	if(layers.empty())
! 		layers.insert(layers.end(), l);
! 	else {
! 		vector<Layer*>::iterator iter = layers.begin();
! 		do {
! 			if(l->isAbove(*iter)) {
! 				++iter;
! 				continue;
! 			} else {
! 				layers.insert(iter, l);
! 				break;
! 			}							
! 		} while( iter != layers.end())
! 	}*/
! 
! 	vector<Layer*>::iterator iter = layers.begin();
! 	while( iter != layers.end()) {
!  		if(l->isAbove(*iter)) {
!  			++iter;
!  			continue;
!  		} else {
!  			layers.insert(iter, l);
! 			inserted = true;
!  			break;
!  		}							
! 	}
! 	if(inserted == false)
! 		layers.insert(iter, l);
! //		layers.insert(layers.end(), l);
! 		
! /*			Layer *y = *iter;
!               if(l->isAbove(y)) {
! 				layers.insert(iter, l);
! 				break;
! 			}			
! 			++iter;		
! 		}				
! 	}*/
! //	LayerPlacer placer(this);
! //	l->accept(&placer);
  }
  void LayerStack::paint(QPainter* p){

Index: LayerStack.h
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/editors/LayerStack.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** LayerStack.h	2001/06/20 19:21:16	1.1.1.1
--- LayerStack.h	2001/07/20 15:57:29	1.2
***************
*** 36,44 ****

  /** The specific layers has an internal order. The background layer is on
!   * the bottom and the manipulation layer is on the top.
    *
!   * ManipulationLayer
!   * 
!   *
    */
  class LayerStack : public AbstractLayer {
--- 36,46 ----

  /** The specific layers has an internal order. The background layer is on
!   * the bottom and the selection layer is at the top.
    *
!   * 5. SelectionLayer				| Top of picture
!   * 4. Manipulation layer
!   * 3. Data layer
!   * 2. Grid layer
!   * 1. Background layer			| Bottom of picture
    */
  class LayerStack : public AbstractLayer {

Index: ManipulationLayer.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/editors/ManipulationLayer.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** ManipulationLayer.cpp	2001/06/20 19:21:20	1.1.1.1
--- ManipulationLayer.cpp	2001/07/20 15:57:29	1.2
***************
*** 19,26 ****
  #include "ManipulationLayer.h"
  #include "LayerVisitor.h"

  void ManipulationLayer::accept(LayerVisitor * visitor){
          visitor->visitManipulationLayer(this);
      }
  ManipulationLayer::~ManipulationLayer(){}
! ManipulationLayer::ManipulationLayer(Viewer* v) : AbstractLayer(v) {}
--- 19,39 ----
  #include "ManipulationLayer.h"
  #include "LayerVisitor.h"
+ #include "LayerChecker.h"
+ #include <qglobal.h>

+ bool ManipulationLayer::isAbove (Layer *other) {
+ 		LayerChecker checker;
+ 
+ 		// The manipulation layer is above the background layer, grid layer and data layer
+ 		if(checker.isBackgroundLayer(other) || checker.isGridLayer(other) || checker.isDataLayer(other))
+ 			return true;
+ 		else
+ 			return false;
+ }
  void ManipulationLayer::accept(LayerVisitor * visitor){
          visitor->visitManipulationLayer(this);
      }
  ManipulationLayer::~ManipulationLayer(){}
! ManipulationLayer::ManipulationLayer(Viewer* v) : AbstractLayer(v) {
! 	    qDebug("ManipulationLayer created");
! }

Index: ManipulationLayer.h
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/editors/ManipulationLayer.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** ManipulationLayer.h	2001/06/20 19:21:19	1.1.1.1
--- ManipulationLayer.h	2001/07/20 15:57:29	1.2
***************
*** 41,44 ****
--- 41,46 ----
       */
      virtual void accept(LayerVisitor * visitor);
+ 
+ 	virtual bool isAbove(Layer *other);
  };

Index: SelectionLayer.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/editors/SelectionLayer.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** SelectionLayer.cpp	2001/06/20 19:21:21	1.1.1.1
--- SelectionLayer.cpp	2001/07/20 15:57:29	1.2
***************
*** 20,23 ****
--- 20,27 ----
  #include "LayerVisitor.h"

+ bool SelectionLayer::isAbove (Layer *other) {
+ 		// The selectoin layer is the highest layer in the picture
+ 		return true;
+ }
  void SelectionLayer::accept(LayerVisitor * visitor){
          visitor->visitSelectionLayer(this);
***************
*** 26,28 ****
--- 30,33 ----
  }
  SelectionLayer::SelectionLayer(Viewer* v) : AbstractLayer(v) {
+ 	    qDebug("SelectionLayer created");
  }

Index: SelectionLayer.h
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/editors/SelectionLayer.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** SelectionLayer.h	2001/06/20 19:21:19	1.1.1.1
--- SelectionLayer.h	2001/07/20 15:57:29	1.2
***************
*** 42,45 ****
--- 42,48 ----

      virtual void accept(LayerVisitor * visitor);
+ 
+ 	virtual bool isAbove(Layer *other);
+ 
  };

Index: StandardDataLayer.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/editors/StandardDataLayer.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** StandardDataLayer.cpp	2001/06/20 19:21:20	1.1.1.1
--- StandardDataLayer.cpp	2001/07/20 15:57:29	1.2
***************
*** 18,21 ****
--- 18,22 ----

  #include "StandardDataLayer.h"
+ #include <qpainter.h>

  StandardDataLayer::~StandardDataLayer(){
***************
*** 27,34 ****
    ViewMapIter iter = views.begin();

!   while ( iter->second ) {
          iter->second->paint(p);
          ++iter;
  	}
  }
  ViewMapIter StandardDataLayer::getDataIterator() {
--- 28,40 ----
    ViewMapIter iter = views.begin();

!   while ( iter != views.end()) {
          iter->second->paint(p);
          ++iter;
  	}
+ 
+ 	p->fillRect(110,90,200,50, Qt::white);
+ 	p->drawRect(110,90,200,50);
+ 	p->drawText(130,120, "Data layer");
+ 
  }
  ViewMapIter StandardDataLayer::getDataIterator() {

Index: StandardEditor.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/editors/StandardEditor.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** StandardEditor.cpp	2001/06/20 19:21:20	1.1.1.1
--- StandardEditor.cpp	2001/07/20 15:57:29	1.2
***************
*** 28,32 ****
  }
  StandardEditor::StandardEditor(Viewer* v) : AbstractEditor(v) {
!     debug("StandardEditor created");
      setChangeManager(new DefaultChangeManager());
      setViewer(v);
--- 28,32 ----
  }
  StandardEditor::StandardEditor(Viewer* v) : AbstractEditor(v) {
!     qDebug("StandardEditor created");
      setChangeManager(new DefaultChangeManager());
      setViewer(v);

Index: StandardManipulationLayer.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/editors/StandardManipulationLayer.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** StandardManipulationLayer.cpp	2001/06/20 19:21:20	1.1.1.1
--- StandardManipulationLayer.cpp	2001/07/20 15:57:29	1.2
***************
*** 18,22 ****
--- 18,36 ----

  #include "StandardManipulationLayer.h"
+ #include <qpainter.h>

+ void StandardManipulationLayer::paint(QPainter* p) {
+ /*  ViewMapIter iter = views.begin();
+ 
+   while ( iter != views.end()) {
+         iter->second->paint(p);
+         ++iter;
+ 	}*/
+ 
+ 	p->fillRect(160,130,200,50, Qt::white);
+ 	p->drawRect(160,130,200,50);
+ 	p->drawText(180,160, "Manipulation layer");
+ 
+ }
  StandardManipulationLayer::~StandardManipulationLayer(){
  }

Index: StandardManipulationLayer.h
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/editors/StandardManipulationLayer.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** StandardManipulationLayer.h	2001/06/20 19:21:20	1.1.1.1
--- StandardManipulationLayer.h	2001/07/20 15:57:29	1.2
***************
*** 32,35 ****
--- 32,37 ----
      ManipulatorVectorIter getManipulatorIterator();

+     virtual void paint(QPainter * p);
+ 
  private:
      ManipulatorVector manipulators;

Index: StandardSelectionLayer.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/editors/StandardSelectionLayer.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** StandardSelectionLayer.cpp	2001/06/20 19:21:20	1.1.1.1
--- StandardSelectionLayer.cpp	2001/07/20 15:57:29	1.2
***************
*** 23,26 ****
--- 23,31 ----
  void StandardSelectionLayer::paint(QPainter* p) {
      p->drawRect(startPoint.x(), startPoint.y(), endPoint.x(), endPoint.y());
+ 
+   p->fillRect(210,170,200,50, Qt::white);
+   p->drawRect(210,170,200,50);
+   p->drawText(230,200, "Selection layer");
+ 
  }
  void StandardSelectionLayer::endMultiSelection(){

Index: StandardSelectionLayer.h
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/editors/StandardSelectionLayer.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** StandardSelectionLayer.h	2001/06/20 19:21:17	1.1.1.1
--- StandardSelectionLayer.h	2001/07/20 15:57:29	1.2
***************
*** 49,52 ****
--- 49,54 ----
      virtual void paint(QPainter * p);

+     virtual SelectionHandle* getHandle(QPoint & pos) { return 0;}
+ 
  private: