Menu
▾
▴
kuml-cvs — This list receives CVS logging messages for kuml.
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(8) |
Nov
(8) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(12) |
Jun
(14) |
Jul
(56) |
Aug
(6) |
Sep
(24) |
Oct
(1) |
Nov
(3) |
Dec
(5) |
| 2002 |
Jan
(2) |
Feb
(6) |
Mar
(22) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Darius S. <dst...@us...> - 2001-07-22 23:21:40
|
Update of /cvsroot/kuml/kuml/kuml_gui/src/ige/common/documents
In directory usw-pr-cvs1:/tmp/cvs-serv2714/common/documents
Modified Files:
AbstractDocument.cpp AbstractDocument.h Document.h
StandardDocument.cpp StandardDocument.h
Log Message:
Added more basic implementation for user interaction
Index: AbstractDocument.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/documents/AbstractDocument.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** AbstractDocument.cpp 2001/07/20 15:57:29 1.2
--- AbstractDocument.cpp 2001/07/22 23:21:38 1.3
***************
*** 81,84 ****
return location;
}
!
--- 81,86 ----
return location;
}
! void AbstractDocument::addView(View *view) {
! dataLayer->add(view);
! }
Index: AbstractDocument.h
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/documents/AbstractDocument.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** AbstractDocument.h 2001/07/20 15:57:29 1.2
--- AbstractDocument.h 2001/07/22 23:21:38 1.3
***************
*** 56,59 ****
--- 56,60 ----
virtual void setViewer(Viewer* viewer);
+ virtual void addView(View *view);
private:
string location;
Index: Document.h
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/documents/Document.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Document.h 2001/07/20 15:57:29 1.2
--- Document.h 2001/07/22 23:21:38 1.3
***************
*** 27,30 ****
--- 27,31 ----
class DataLayer;
class GridLayer;
+ class View;
/**
***************
*** 48,51 ****
--- 49,54 ----
virtual void setViewer(Viewer* v) = 0;
+
+ virtual void addView(View *view) = 0;
};
#endif //DOCUMENT_H
Index: StandardDocument.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/documents/StandardDocument.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** StandardDocument.cpp 2001/07/20 15:57:29 1.2
--- StandardDocument.cpp 2001/07/22 23:21:38 1.3
***************
*** 23,27 ****
#include "ige/common/editors/BackgroundLayer.h"
! void StandardDocument::paint(QPainter* p){}
StandardDocument::~StandardDocument(){
if(dataLayer)
--- 23,38 ----
#include "ige/common/editors/BackgroundLayer.h"
! #include <qpopupmenu.h>
!
! QPopupMenu* StandardDocument::createPopupMenu() {
! QPopupMenu *menu = new QPopupMenu();
! menu->setCaption("Standard Document");
! menu ->insertItem("Close (N/A)");
! menu ->insertItem("Refresh (N/A)");
!
! return menu;
! }
! void StandardDocument::paint(QPainter* p){
! }
StandardDocument::~StandardDocument(){
if(dataLayer)
Index: StandardDocument.h
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/documents/StandardDocument.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** StandardDocument.h 2001/07/20 15:57:29 1.2
--- StandardDocument.h 2001/07/22 23:21:38 1.3
***************
*** 34,38 ****
virtual void paint(QPainter* p);
! private:
/** @link aggregation */
--- 34,40 ----
virtual void paint(QPainter* p);
! virtual QPopupMenu* createPopupMenu();
!
! private:
/** @link aggregation */
|
|
From: Darius S. <dst...@us...> - 2001-07-22 23:21:40
|
Update of /cvsroot/kuml/kuml/kuml_gui/src/ige/common/commands
In directory usw-pr-cvs1:/tmp/cvs-serv2714/common/commands
Modified Files:
MoveCmd.cpp MoveCmd.h NewTextCmd.cpp NewTextCmd.h
NewViewCmd.cpp NewViewCmd.h
Log Message:
Added more basic implementation for user interaction
Index: MoveCmd.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/commands/MoveCmd.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** MoveCmd.cpp 2001/07/20 15:57:28 1.2
--- MoveCmd.cpp 2001/07/22 23:21:38 1.3
***************
*** 19,22 ****
--- 19,23 ----
#include "MoveCmd.h"
+ #include "ige/common/views/View.h"
#include <qglobal.h> // debug(const char*, ...)
***************
*** 24,28 ****
void MoveCmd::execute(Editor* editor){
! qDebug("MoveCmd->Execute called (Not yet implemented!)");
}
void MoveCmd::undo(){
--- 25,30 ----
void MoveCmd::execute(Editor* editor){
! // qDebug("MoveCmd->Execute called (Not yet implemented!)");
! view->setCenter(view->getCenter() + delta);
}
void MoveCmd::undo(){
***************
*** 30,34 ****
}
MoveCmd::~MoveCmd(){}
! MoveCmd::MoveCmd(View * v, int dx, int dy){}
--- 32,38 ----
}
MoveCmd::~MoveCmd(){}
! MoveCmd::MoveCmd(View * v, int dx, int dy) : delta(dx, dy) {
! view = v;
! }
Index: MoveCmd.h
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/commands/MoveCmd.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** MoveCmd.h 2001/06/20 19:21:23 1.1.1.1
--- MoveCmd.h 2001/07/22 23:21:38 1.2
***************
*** 21,24 ****
--- 21,27 ----
#include "EditorCommand.h"
#include "AbstractCommand.h"
+
+ #include <qpoint.h>
+
class Editor;
class View;
***************
*** 38,41 ****
--- 41,48 ----
return "Move";
}
+
+ private:
+ View *view;
+ QPoint delta;
};
#endif //MOVECMD_H
Index: NewTextCmd.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/commands/NewTextCmd.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** NewTextCmd.cpp 2001/07/20 15:57:28 1.2
--- NewTextCmd.cpp 2001/07/22 23:21:38 1.3
***************
*** 18,33 ****
#include "NewTextCmd.h"
#include <qglobal.h>// debug(const char*, ...)
void NewTextCmd::execute(Editor* editor){
! qDebug("CreateTextCmd->Execute called (Not yet implemented!)");
}
void NewTextCmd::undo(){
qDebug("CreateTextCmd->Undo called (Not yet implemented!)");
}
! View * NewTextCmd::createView(){}
! NewTextCmd::~NewTextCmd(){}
! NewTextCmd::NewTextCmd(){}
--- 18,46 ----
#include "NewTextCmd.h"
+ #include "ige/common/views/TextView.h"
+ #include "ige/common/views/ViewFactory.h"
+ #include "ige/common/models/TextModel.h"
+ #include "ige/common/documents/Document.h"
#include <qglobal.h>// debug(const char*, ...)
void NewTextCmd::execute(Editor* editor){
! NewViewCmd::execute(editor);
! // qDebug("CreateTextCmd->Execute called (Not yet implemented!)");
}
void NewTextCmd::undo(){
qDebug("CreateTextCmd->Undo called (Not yet implemented!)");
}
! View * NewTextCmd::createView(Document *doc){
! TextModel *tm = new TextModel();
!
! TextView *tv = ViewFactory::getInstance()->create(tm);
! tv->setViewer(doc->getViewer());
! return tv;
! }
! NewTextCmd::~NewTextCmd(){
! }
! NewTextCmd::NewTextCmd(){
! }
Index: NewTextCmd.h
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/commands/NewTextCmd.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** NewTextCmd.h 2001/06/20 19:21:25 1.1.1.1
--- NewTextCmd.h 2001/07/22 23:21:38 1.2
***************
*** 42,46 ****
protected:
! virtual View * createView();
};
#endif //NEWTEXTCMD_H
--- 42,46 ----
protected:
! virtual View * createView(Document *doc);
};
#endif //NEWTEXTCMD_H
Index: NewViewCmd.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/commands/NewViewCmd.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** NewViewCmd.cpp 2001/06/20 19:21:25 1.1.1.1
--- NewViewCmd.cpp 2001/07/22 23:21:38 1.2
***************
*** 18,24 ****
#include "NewViewCmd.h"
NewViewCmd::~NewViewCmd(){}
! NewViewCmd::NewViewCmd(){}
--- 18,33 ----
#include "NewViewCmd.h"
+ #include "ige/common/documents/Document.h"
+ #include "ige/common/editors/Editor.h"
+ void NewViewCmd::execute(Editor* editor) {
+ Document *doc = editor->getDocument();
+ createdView = createView(doc);
+ doc->addView(createdView);
+ }
NewViewCmd::~NewViewCmd(){}
! NewViewCmd::NewViewCmd(){
! createdView = 0;
! }
Index: NewViewCmd.h
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/commands/NewViewCmd.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** NewViewCmd.h 2001/06/20 19:21:25 1.1.1.1
--- NewViewCmd.h 2001/07/22 23:21:38 1.2
***************
*** 22,25 ****
--- 22,26 ----
#include "AbstractCommand.h"
class View;
+ class Document;
class NewViewCmd : public AbstractCommand {
***************
*** 30,39 ****
virtual ~NewViewCmd();
protected:
/** Factory method. Implement this your subclasses to create the desired object.
*/
! virtual View * createView() = 0;
! protected:
};
#endif //NEWVIEWCMD_H
--- 31,47 ----
virtual ~NewViewCmd();
+ virtual void execute(Editor* editor);
+
+ View* getCreated() {
+ return createdView;
+ }
+
protected:
/** Factory method. Implement this your subclasses to create the desired object.
*/
! virtual View * createView(Document *doc) = 0;
! private:
! View *createdView;
};
#endif //NEWVIEWCMD_H
|
|
From: Darius S. <dst...@us...> - 2001-07-22 23:21:40
|
Update of /cvsroot/kuml/kuml/kuml_gui/src/ige In directory usw-pr-cvs1:/tmp/cvs-serv2714 Modified Files: Makefile ige.pro readme.txt typedefs.h Log Message: Added more basic implementation for user interaction Index: Makefile =================================================================== RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** Makefile 2001/07/20 15:57:28 1.3 --- Makefile 2001/07/22 23:21:37 1.4 *************** *** 1,10 **** ############################################################################# # Makefile for building libige.so.1.0.0 ! # Generated by tmake at 15:39, 2001/07/18 # Project: ige # Template: lib ############################################################################# ! QTDIR = /usr/lib/qt2 ####### Compiler, tools and options --- 1,13 ---- ############################################################################# # Makefile for building libige.so.1.0.0 ! # Generated by tmake at 23:12, 2001/07/22 # Project: ige # Template: lib ############################################################################# ! # Remove this if you use a system which sets this ! # environment variables correctly ! # QTDIR = /usr/lib/qt2 ! ####### Compiler, tools and options *************** *** 189,192 **** --- 192,197 ---- common/manipulators/AbstractViewManipulator.cpp \ common/manipulators/RectangleViewResizer.cpp \ + common/manipulators/ViewResizer.cpp \ + common/manipulators/ViewSelector.cpp \ common/models/AbstractModel.cpp \ common/models/TextModel.cpp \ *************** *** 272,275 **** --- 277,282 ---- common/manipulators/AbstractViewManipulator.o \ common/manipulators/RectangleViewResizer.o \ + common/manipulators/ViewResizer.o \ + common/manipulators/ViewSelector.o \ common/models/AbstractModel.o \ common/models/TextModel.o \ *************** *** 511,515 **** common/editors/Editor.h \ common/editors/ChangeManager.h \ ! common/editors/LayerVisitor.h common/editors/DefaultChangeManager.o: common/editors/DefaultChangeManager.cpp \ --- 518,524 ---- common/editors/Editor.h \ common/editors/ChangeManager.h \ ! common/editors/LayerVisitor.h \ ! common/editors/LayerChecker.h \ ! common/editors/LayerVisitorAdapter.h common/editors/DefaultChangeManager.o: common/editors/DefaultChangeManager.cpp \ *************** *** 538,543 **** common/editors/Editor.h \ common/editors/ChangeManager.h \ ! common/editors/Viewer.h \ ! common/editors/LayerVisitor.h common/editors/LayerChecker.o: common/editors/LayerChecker.cpp \ --- 547,554 ---- common/editors/Editor.h \ common/editors/ChangeManager.h \ ! common/editors/LayerChecker.h \ ! common/editors/LayerVisitorAdapter.h \ ! common/editors/LayerVisitor.h \ ! common/editors/Viewer.h common/editors/LayerChecker.o: common/editors/LayerChecker.cpp \ *************** *** 579,583 **** common/editors/Editor.h \ common/editors/ChangeManager.h \ ! common/editors/LayerVisitor.h common/editors/Scaler.o: common/editors/Scaler.cpp \ --- 590,596 ---- common/editors/Editor.h \ common/editors/ChangeManager.h \ ! common/editors/LayerVisitor.h \ ! common/editors/LayerChecker.h \ ! common/editors/LayerVisitorAdapter.h common/editors/Scaler.o: common/editors/Scaler.cpp \ *************** *** 641,644 **** --- 654,668 ---- common/manipulators/ViewSelector.h + common/manipulators/ViewResizer.o: common/manipulators/ViewResizer.cpp \ + common/manipulators/ViewResizer.h \ + common/manipulators/AbstractViewManipulator.h \ + common/manipulators/ViewManipulator.h \ + common/manipulators/ViewSelector.h + + common/manipulators/ViewSelector.o: common/manipulators/ViewSelector.cpp \ + common/manipulators/ViewSelector.h \ + common/manipulators/AbstractViewManipulator.h \ + common/manipulators/ViewManipulator.h + common/models/AbstractModel.o: common/models/AbstractModel.cpp \ common/models/AbstractModel.h \ *************** *** 749,753 **** common/views/ViewFactory.o: common/views/ViewFactory.cpp \ ! common/views/ViewFactory.h extensions/net/commands/NewEdgeCmd.o: extensions/net/commands/NewEdgeCmd.cpp \ --- 773,787 ---- common/views/ViewFactory.o: common/views/ViewFactory.cpp \ ! common/views/ViewFactory.h \ ! common/views/TextView.h \ ! common/views/RectangleView.h \ ! common/views/SelectableView.h \ ! common/views/AbstractView.h \ ! common/views/Positionable.h \ ! common/views/Selectable.h \ ! common/views/PaintAttributes.h \ ! common/views/View.h \ ! common/views/Clonable.h \ ! common/views/Rectangle.h extensions/net/commands/NewEdgeCmd.o: extensions/net/commands/NewEdgeCmd.cpp \ Index: ige.pro =================================================================== RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/ige.pro,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** ige.pro 2001/07/20 15:57:28 1.3 --- ige.pro 2001/07/22 23:21:37 1.4 *************** *** 166,169 **** --- 166,171 ---- common/manipulators/AbstractViewManipulator.cpp \ common/manipulators/RectangleViewResizer.cpp \ + common/manipulators/ViewResizer.cpp \ + common/manipulators/ViewSelector.cpp \ common/models/AbstractModel.cpp \ common/models/TextModel.cpp \ Index: readme.txt =================================================================== RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/readme.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** readme.txt 2001/07/08 16:13:07 1.3 --- readme.txt 2001/07/22 23:21:37 1.4 *************** *** 26,31 **** therefore it must be set in order to compile the sources without errors. ! I've written a small script workaround that sets this variable and starts the ! make process. You may use it if you share my problem. Darius Stachow <sta...@in...> --- 26,30 ---- therefore it must be set in order to compile the sources without errors. ! Set QTDIR in the top of the makefile if you share my problem. Darius Stachow <sta...@in...> Index: typedefs.h =================================================================== RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/typedefs.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** typedefs.h 2001/06/20 19:21:07 1.1.1.1 --- typedefs.h 2001/07/22 23:21:37 1.2 *************** *** 35,38 **** typedef vector<ViewManipulator*>::iterator ManipulatorVectorIter; ! typedef vector<SelectionHandle*> SelectionHandleVector; ! typedef vector<SelectionHandle*>::iterator SelectionHandleIter; --- 35,39 ---- typedef vector<ViewManipulator*>::iterator ManipulatorVectorIter; ! typedef vector<SelectionHandle*> HandleVector; ! typedef vector<SelectionHandle*>::iterator HandleVectorIter; ! |
|
From: Darius S. <dst...@us...> - 2001-07-22 23:21:40
|
Update of /cvsroot/kuml/kuml/kuml_gui/src/ige/common
In directory usw-pr-cvs1:/tmp/cvs-serv2714/common
Modified Files:
EventHandler.h Paintable.h
Log Message:
Added more basic implementation for user interaction
Index: EventHandler.h
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/EventHandler.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** EventHandler.h 2001/06/20 19:21:16 1.1.1.1
--- EventHandler.h 2001/07/22 23:21:37 1.2
***************
*** 35,38 ****
--- 35,48 ----
virtual void mouseDblClick(QMouseEvent * e) = 0;
+
+ /** Left mouse button clicked
+ * Implement this in your sub classes
+ */
+ virtual void mouseLMBPress(QMouseEvent * e) =0;
+
+ /** Right mouse button clicked
+ * Implement this in your sub classes
+ */
+ virtual void mouseRMBPress(QMouseEvent * e) =0;
};
#endif //EVENTHANDLER_H
Index: Paintable.h
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/Paintable.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Paintable.h 2001/06/20 19:21:16 1.1.1.1
--- Paintable.h 2001/07/22 23:21:37 1.2
***************
*** 27,31 ****
/**
! * Implement this
*/
virtual void paint(QPainter * painter) = 0;
--- 27,31 ----
/**
! * Implement this in your sub classes to paint something
*/
virtual void paint(QPainter * painter) = 0;
|
|
From: Darius S. <dst...@us...> - 2001-07-22 23:15:57
|
Update of /cvsroot/kuml/kuml/kuml_gui/src/editorapp/editorapp
In directory usw-pr-cvs1:/tmp/cvs-serv1529
Modified Files:
editorapp.cpp editorapp.h editorappdoc.h editorappview.cpp
editorappview.h
Log Message:
Let the editor execute more commands
Index: editorapp.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/editorapp/editorapp/editorapp.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** editorapp.cpp 2001/07/08 16:01:51 1.1.1.1
--- editorapp.cpp 2001/07/22 23:15:55 1.2
***************
*** 43,46 ****
--- 43,47 ----
viewToolBar->setOn(true);
viewStatusBar->setOn(true);
+ resize(600,600);
}
Index: editorapp.h
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/editorapp/editorapp/editorapp.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** editorapp.h 2001/07/08 16:01:51 1.1.1.1
--- editorapp.h 2001/07/22 23:15:55 1.2
***************
*** 55,59 ****
EditorAppApp();
/** destructor */
! ~EditorAppApp();
/** initializes all QActions of the application */
void initActions();
--- 55,59 ----
EditorAppApp();
/** destructor */
! virtual ~EditorAppApp();
/** initializes all QActions of the application */
void initActions();
Index: editorappdoc.h
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/editorapp/editorapp/editorappdoc.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** editorappdoc.h 2001/07/08 16:01:52 1.1.1.1
--- editorappdoc.h 2001/07/22 23:15:55 1.2
***************
*** 34,38 ****
public:
EditorAppDoc();
! ~EditorAppDoc();
void newDoc();
bool save();
--- 34,38 ----
public:
EditorAppDoc();
! virtual ~EditorAppDoc();
void newDoc();
bool save();
Index: editorappview.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/editorapp/editorapp/editorappview.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** editorappview.cpp 2001/07/08 16:01:50 1.1.1.1
--- editorappview.cpp 2001/07/22 23:15:55 1.2
***************
*** 19,44 ****
#include "editorappview.h"
#include "ige/common/commands/NewTextCmd.h"
#include "ige/common/commands/NewStdDocumentCmd.h"
EditorAppView::EditorAppView(QWidget *parent, EditorAppDoc *doc) : DoubleBufferViewer(parent)
- //EditorAppView::EditorAppView(QWidget *parent, EditorAppDoc *doc) : QWidget(parent)
{
! /** connect doc with the view*/
! connect(doc, SIGNAL(documentChanged()), this, SLOT(slotDocumentChanged()));
// Add interaction
editor = new StandardEditor(this);
NewStdDocumentCmd *cmd1 = new NewStdDocumentCmd();
editor->execute(cmd1);
NewTextCmd *cmd2 = new NewTextCmd();
editor->execute(cmd2);
! editor->undo();
}
EditorAppView::~EditorAppView()
{
}
--- 19,57 ----
#include "editorappview.h"
#include "ige/common/commands/NewTextCmd.h"
+ #include "ige/common/commands/MoveCmd.h"
#include "ige/common/commands/NewStdDocumentCmd.h"
EditorAppView::EditorAppView(QWidget *parent, EditorAppDoc *doc) : DoubleBufferViewer(parent)
{
! connect(doc, SIGNAL(documentChanged()), this, SLOT(slotDocumentChanged()));
+ /* ################################################################## */
// Add interaction
editor = new StandardEditor(this);
+ // Create an empty standard document
NewStdDocumentCmd *cmd1 = new NewStdDocumentCmd();
editor->execute(cmd1);
+ // Create some simple text views
NewTextCmd *cmd2 = new NewTextCmd();
editor->execute(cmd2);
+ editor->execute(new MoveCmd(cmd2->getCreated(), -20,50));
! NewTextCmd *cmd3 = new NewTextCmd();
! editor->execute(cmd3);
! editor->execute(new MoveCmd(cmd3->getCreated(), 70,80));
!
! NewTextCmd *cmd4 = new NewTextCmd();
! editor->execute(cmd4);
! editor->execute(new MoveCmd(cmd4->getCreated(), 160,200));
!
! // editor->undo();
! /* ################################################################## */
}
EditorAppView::~EditorAppView()
{
+ delete editor;
}
Index: editorappview.h
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/editorapp/editorapp/editorappview.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** editorappview.h 2001/07/08 16:01:50 1.1.1.1
--- editorappview.h 2001/07/22 23:15:55 1.2
***************
*** 40,44 ****
public:
EditorAppView(QWidget *parent=0, EditorAppDoc* doc=0);
! ~EditorAppView();
protected slots:
--- 40,44 ----
public:
EditorAppView(QWidget *parent=0, EditorAppDoc* doc=0);
! virtual ~EditorAppView();
protected slots:
|
|
From: Darius S. <dst...@us...> - 2001-07-22 23:10:14
|
Update of /cvsroot/kuml/kuml/kuml_gui/src/ige/common/manipulators
In directory usw-pr-cvs1:/tmp/cvs-serv307
Added Files:
ViewResizer.cpp
Log Message:
Added
--- NEW FILE ---
/***************************************************************************
ViewResizer.cpp - description
-------------------
begin : Wed Jun 20 2001
copyright : (C) 2001 by the kUML Team
author : Darius Stachow
email : sta...@in...
***************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#include "ViewResizer.h"
#include "ige/common/editors/Viewer.h"
#include <qevent.h>
ViewResizer::ViewResizer(View * target) : ViewSelector(target) {
}
ViewResizer::~ViewResizer() {
}
void ViewResizer::mouseLMBPress(QMouseEvent * e) {
oldMousePos = e->pos();
}
void ViewResizer::moveTarget(int diffx, int diffy) {
QRect damagedArea = getTarget()->bounds();
SelectableView *view = (SelectableView *)getTarget();
view->setCenter(QPoint(view->getCenter().x() + diffx, view->getCenter().y() + diffy));
placeHandles();
damagedArea = damagedArea.unite(view->bounds());
view->getViewer()->refresh(damagedArea);
}
void ViewResizer::mouseMove(QMouseEvent* e){
int dx = e->x() - oldMousePos.x();
int dy = e->y() - oldMousePos.y();
moveTarget(dx, dy);
oldMousePos = e->pos();
}
|
|
From: Chris M. <zm...@us...> - 2001-07-21 23:01:37
|
Update of /cvsroot/kuml/kuml/libkuml/uml/tools
In directory usw-pr-cvs1:/tmp/cvs-serv1929
Modified Files:
gen_class_ccs.xsl
Log Message:
A or B end of association resolved.
Index: gen_class_ccs.xsl
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/uml/tools/gen_class_ccs.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** gen_class_ccs.xsl 2001/07/09 22:38:30 1.4
--- gen_class_ccs.xsl 2001/07/21 23:01:33 1.5
***************
*** 503,506 ****
--- 503,519 ----
+ <xsl:template match="Model:AssociationEnd" mode="a_or_b_end_of_ref">
+ <xsl:choose>
+ <!-- Is this end the A end? -->
+ <xsl:when test='@xmi.id = ../Model:AssociationEnd[position()=1]/@xmi.id'>
+ <xsl:text>A_END</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>B_END</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
+
<xsl:template name="REFERENCE">
***************
*** 544,547 ****
--- 557,565 ----
<xsl:variable name="assoc_end_ref" select="@referencedEnd"/>
+ <xsl:variable name="end_a_or_b">
+ <xsl:apply-templates mode="a_or_b_end_of_ref"
+ select='/descendant::Model:AssociationEnd[@xmi.id=$assoc_end_ref]'/>
+ </xsl:variable>
+
<!-- The value of the name attribute of a Model:Association descendant
of the root node, which contains the referenced AssociationEnd.
***************
*** 600,603 ****
--- 618,625 ----
<xsl:text> </xsl:text>
+ <xsl:text>// A OR B END </xsl:text>
+ <xsl:value-of select="$end_a_or_b"/>
+ <xsl:text> </xsl:text>
+
<xsl:text>// BASE ASSOC NAME </xsl:text>
<xsl:value-of select="$base_assoc_name"/>
***************
*** 876,884 ****
<xsl:text>::</xsl:text>
<xsl:value-of select="$assoc_name"/>
! <xsl:text>_ptr assoc_proxy = cp-></xsl:text>
<xsl:value-of select="$lc_assoc_name"/>
<xsl:text>_ref(); </xsl:text>
! <xsl:text> assoc_proxy->add( new_element, _this() ); </xsl:text>
<xsl:text>} </xsl:text>
--- 898,915 ----
<xsl:text>::</xsl:text>
<xsl:value-of select="$assoc_name"/>
! <xsl:text>_ptr assoc_proxy = </xsl:text>
!
! <xsl:text> cp-></xsl:text>
<xsl:value-of select="$lc_assoc_name"/>
<xsl:text>_ref(); </xsl:text>
! <xsl:choose>
! <xsl:when test='$end_a_or_b = "A_END"'>
! <xsl:text> assoc_proxy->add( new_element, _this() ); </xsl:text>
! </xsl:when>
! <xsl:otherwise>
! <xsl:text> assoc_proxy->add( _this(), new_element ); </xsl:text>
! </xsl:otherwise>
! </xsl:choose>
<xsl:text>} </xsl:text>
***************
*** 930,934 ****
<xsl:text> assoc_proxy->add_before_</xsl:text>
<xsl:value-of select="$ref_name"/>
! <xsl:text>(new_element, _this(), before_element); </xsl:text>
<xsl:text>} </xsl:text>
--- 961,972 ----
<xsl:text> assoc_proxy->add_before_</xsl:text>
<xsl:value-of select="$ref_name"/>
! <xsl:choose>
! <xsl:when test='$end_a_or_b = "A_END"'>
! <xsl:text>(new_element, _this(), before_element); </xsl:text>
! </xsl:when>
! <xsl:otherwise>
! <xsl:text>(_this(), new_element, before_element); </xsl:text>
! </xsl:otherwise>
! </xsl:choose>
<xsl:text>} </xsl:text>
***************
*** 978,982 ****
<xsl:text> assoc_proxy->modify_</xsl:text>
<xsl:value-of select="$ref_name"/>
! <xsl:text>(old_element, _this(), new_element); </xsl:text>
<xsl:text>} </xsl:text>
--- 1016,1027 ----
<xsl:text> assoc_proxy->modify_</xsl:text>
<xsl:value-of select="$ref_name"/>
! <xsl:choose>
! <xsl:when test='$end_a_or_b = "A_END"'>
! <xsl:text>(old_element, _this(), new_element); </xsl:text>
! </xsl:when>
! <xsl:otherwise>
! <xsl:text>(_this(), old_element, new_element); </xsl:text>
! </xsl:otherwise>
! </xsl:choose>
<xsl:text>} </xsl:text>
***************
*** 1019,1023 ****
<xsl:text>_ref(); </xsl:text>
! <xsl:text> assoc_proxy->remove( old_element, _this() ); </xsl:text>
<xsl:text>} </xsl:text>
--- 1064,1075 ----
<xsl:text>_ref(); </xsl:text>
! <xsl:choose>
! <xsl:when test='$end_a_or_b = "A_END"'>
! <xsl:text> assoc_proxy->remove( old_element, _this() ); </xsl:text>
! </xsl:when>
! <xsl:otherwise>
! <xsl:text> assoc_proxy->remove( _this(), old_element ); </xsl:text>
! </xsl:otherwise>
! </xsl:choose>
<xsl:text>} </xsl:text>
|
|
From: Darius S. <dst...@us...> - 2001-07-20 15:57:32
|
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;
};
|
|
From: Darius S. <dst...@us...> - 2001-07-20 15:57:32
|
Update of /cvsroot/kuml/kuml/kuml_gui/src/ige/common/commands
In directory usw-pr-cvs1:/tmp/cvs-serv28950/common/commands
Modified Files:
CommandHistory.cpp CommandHistory.h CopyCmd.cpp CutCmd.cpp
MoveCmd.cpp NewDocumentCmd.cpp NewDocumentCmd.h
NewStdDocumentCmd.cpp NewStdDocumentCmd.h NewTextCmd.cpp
PasteCmd.cpp
Log Message:
A Viewer can paint its layers now
Index: CommandHistory.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/commands/CommandHistory.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** CommandHistory.cpp 2001/06/20 19:21:23 1.1.1.1
--- CommandHistory.cpp 2001/07/20 15:57:28 1.2
***************
*** 32,35 ****
--- 32,38 ----
CommandHistory::CommandHistory() {
}
+ CommandHistory::~CommandHistory() {
+ // Delete all commands in history
+ }
Index: CommandHistory.h
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/commands/CommandHistory.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** CommandHistory.h 2001/06/20 19:21:24 1.1.1.1
--- CommandHistory.h 2001/07/20 15:57:28 1.2
***************
*** 24,28 ****
public:
! CommandHistory();
void push(EditorCommand * c);
--- 24,29 ----
public:
! CommandHistory();
! ~CommandHistory();
void push(EditorCommand * c);
Index: CopyCmd.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/commands/CopyCmd.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** CopyCmd.cpp 2001/06/20 19:21:25 1.1.1.1
--- CopyCmd.cpp 2001/07/20 15:57:28 1.2
***************
*** 22,29 ****
void CopyCmd::execute(Editor* editor){
! debug("CopyCmd->Execute called (Not yet implemented!)");
}
void CopyCmd::undo(){
! debug("CopyCmd->Undo called (Not yet implemented!)");
}
CopyCmd::~CopyCmd(){
--- 22,29 ----
void CopyCmd::execute(Editor* editor){
! qDebug("CopyCmd->Execute called (Not yet implemented!)");
}
void CopyCmd::undo(){
! qDebug("CopyCmd->Undo called (Not yet implemented!)");
}
CopyCmd::~CopyCmd(){
Index: CutCmd.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/commands/CutCmd.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** CutCmd.cpp 2001/06/20 19:21:25 1.1.1.1
--- CutCmd.cpp 2001/07/20 15:57:28 1.2
***************
*** 21,28 ****
void CutCmd::execute(Editor* editor){
! debug("CutCmd->Execute called (Not yet implemented!)");
}
void CutCmd::undo(){
! debug("CutCmd->Undo called (Not yet implemented!)");
}
CutCmd::~CutCmd(){}
--- 21,28 ----
void CutCmd::execute(Editor* editor){
! qDebug("CutCmd->Execute called (Not yet implemented!)");
}
void CutCmd::undo(){
! qDebug("CutCmd->Undo called (Not yet implemented!)");
}
CutCmd::~CutCmd(){}
Index: MoveCmd.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/commands/MoveCmd.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** MoveCmd.cpp 2001/06/20 19:21:23 1.1.1.1
--- MoveCmd.cpp 2001/07/20 15:57:28 1.2
***************
*** 24,31 ****
void MoveCmd::execute(Editor* editor){
! debug("MoveCmd->Execute called (Not yet implemented!)");
}
void MoveCmd::undo(){
! debug("MoveCmd->Undo called (Not yet implemented!)");
}
MoveCmd::~MoveCmd(){}
--- 24,31 ----
void MoveCmd::execute(Editor* editor){
! qDebug("MoveCmd->Execute called (Not yet implemented!)");
}
void MoveCmd::undo(){
! qDebug("MoveCmd->Undo called (Not yet implemented!)");
}
MoveCmd::~MoveCmd(){}
Index: NewDocumentCmd.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/commands/NewDocumentCmd.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** NewDocumentCmd.cpp 2001/06/20 19:21:24 1.1.1.1
--- NewDocumentCmd.cpp 2001/07/20 15:57:28 1.2
***************
*** 18,26 ****
#include "NewDocumentCmd.h"
NewDocumentCmd::~NewDocumentCmd(){}
NewDocumentCmd::NewDocumentCmd(){}
void NewDocumentCmd::execute(Editor* editor){
! createdDocument = createDocument();
}
Document* NewDocumentCmd::getCreatedDocument(){
--- 18,28 ----
#include "NewDocumentCmd.h"
+ #include "ige/common/editors/Editor.h"
NewDocumentCmd::~NewDocumentCmd(){}
NewDocumentCmd::NewDocumentCmd(){}
void NewDocumentCmd::execute(Editor* editor){
! createdDocument = createDocument(editor->getViewer());
! editor->setDocument(createdDocument);
}
Document* NewDocumentCmd::getCreatedDocument(){
Index: NewDocumentCmd.h
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/commands/NewDocumentCmd.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** NewDocumentCmd.h 2001/06/20 19:21:24 1.1.1.1
--- NewDocumentCmd.h 2001/07/20 15:57:28 1.2
***************
*** 21,25 ****
--- 21,28 ----
#include "EditorCommand.h"
#include "AbstractCommand.h"
+
+ class Viewer;
class Document;
+
class NewDocumentCmd : public AbstractCommand {
public:
***************
*** 40,44 ****
* The method will be invoked by execute().
*/
! virtual Document* createDocument() = 0;
};
--- 43,47 ----
* The method will be invoked by execute().
*/
! virtual Document* createDocument(Viewer *viewer) = 0;
};
Index: NewStdDocumentCmd.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/commands/NewStdDocumentCmd.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** NewStdDocumentCmd.cpp 2001/06/20 19:21:24 1.1.1.1
--- NewStdDocumentCmd.cpp 2001/07/20 15:57:28 1.2
***************
*** 23,36 ****
NewStdDocumentCmd::~NewStdDocumentCmd(){}
NewStdDocumentCmd::NewStdDocumentCmd(){}
! void NewStdDocumentCmd::execute(Editor* editor){
! debug("NewStdDocumentCmd->Execute called (Not yet implemented!)");
! }
void NewStdDocumentCmd::undo(){
! debug("NewStdDocumentCmd->Undo called (Not yet implemented!)");
}
class Document;
! Document* NewStdDocumentCmd::createDocument(){
! StandardDocument * stdDoc = new StandardDocument();
return stdDoc;
}
--- 23,36 ----
NewStdDocumentCmd::~NewStdDocumentCmd(){}
NewStdDocumentCmd::NewStdDocumentCmd(){}
! /*void NewStdDocumentCmd::execute(Editor* editor){
! NewDocumentCmd::execute(editor);
! }*/
void NewStdDocumentCmd::undo(){
! qDebug("NewStdDocumentCmd->Undo called (Not yet implemented!)");
}
class Document;
! Document* NewStdDocumentCmd::createDocument(Viewer* viewer){
! StandardDocument * stdDoc = new StandardDocument(viewer);
return stdDoc;
}
Index: NewStdDocumentCmd.h
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/commands/NewStdDocumentCmd.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** NewStdDocumentCmd.h 2001/06/20 19:21:24 1.1.1.1
--- NewStdDocumentCmd.h 2001/07/20 15:57:28 1.2
***************
*** 34,38 ****
protected:
/** Factory method. This implementation creates a StandardDocument. */
! virtual Document * createDocument();
public:
--- 34,38 ----
protected:
/** Factory method. This implementation creates a StandardDocument. */
! virtual Document * createDocument(Viewer *viewer);
public:
***************
*** 44,50 ****
virtual void undo();
! virtual void execute(Editor* editor);
protected:
};
--- 44,51 ----
virtual void undo();
! // virtual void execute(Editor* editor);
protected:
+
};
Index: NewTextCmd.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/commands/NewTextCmd.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** NewTextCmd.cpp 2001/06/20 19:21:24 1.1.1.1
--- NewTextCmd.cpp 2001/07/20 15:57:28 1.2
***************
*** 22,29 ****
void NewTextCmd::execute(Editor* editor){
! debug("CreateTextCmd->Execute called (Not yet implemented!)");
}
void NewTextCmd::undo(){
! debug("CreateTextCmd->Undo called (Not yet implemented!)");
}
View * NewTextCmd::createView(){}
--- 22,29 ----
void NewTextCmd::execute(Editor* editor){
! qDebug("CreateTextCmd->Execute called (Not yet implemented!)");
}
void NewTextCmd::undo(){
! qDebug("CreateTextCmd->Undo called (Not yet implemented!)");
}
View * NewTextCmd::createView(){}
Index: PasteCmd.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/commands/PasteCmd.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** PasteCmd.cpp 2001/06/20 19:21:25 1.1.1.1
--- PasteCmd.cpp 2001/07/20 15:57:28 1.2
***************
*** 22,29 ****
void PasteCmd::execute(Editor* editor){
! debug("PasteCmd->Execute called (Not yet implemented!)");
}
void PasteCmd::undo(){
! debug("PasteCmd->Undo called (Not yet implemented!)");
}
PasteCmd::~PasteCmd(){}
--- 22,29 ----
void PasteCmd::execute(Editor* editor){
! qDebug("PasteCmd->Execute called (Not yet implemented!)");
}
void PasteCmd::undo(){
! qDebug("PasteCmd->Undo called (Not yet implemented!)");
}
PasteCmd::~PasteCmd(){}
|
|
From: Darius S. <dst...@us...> - 2001-07-20 15:57:32
|
Update of /cvsroot/kuml/kuml/kuml_gui/src/ige/extensions/uml/commands
In directory usw-pr-cvs1:/tmp/cvs-serv28950/extensions/uml/commands
Modified Files:
NewAssociationCmd.cpp NewClassCmd.cpp NewClassDiagramCmd.cpp
NewGeneralizationCmd.cpp
Log Message:
A Viewer can paint its layers now
Index: NewAssociationCmd.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/extensions/uml/commands/NewAssociationCmd.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** NewAssociationCmd.cpp 2001/06/20 19:21:10 1.1.1.1
--- NewAssociationCmd.cpp 2001/07/20 15:57:29 1.2
***************
*** 22,29 ****
void NewAssociationCmd::undo(){
! debug("CreateAssociationCmd->Undo called (Not yet implemented!)");
}
void NewAssociationCmd::execute(Editor* editor){
! debug("CreateAssociationCmd->Execute called (Not yet implemented!)");
}
View * NewAssociationCmd::createView(){}
--- 22,29 ----
void NewAssociationCmd::undo(){
! qDebug("CreateAssociationCmd->Undo called (Not yet implemented!)");
}
void NewAssociationCmd::execute(Editor* editor){
! qDebug("CreateAssociationCmd->Execute called (Not yet implemented!)");
}
View * NewAssociationCmd::createView(){}
Index: NewClassCmd.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/extensions/uml/commands/NewClassCmd.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** NewClassCmd.cpp 2001/06/20 19:21:10 1.1.1.1
--- NewClassCmd.cpp 2001/07/20 15:57:29 1.2
***************
*** 22,29 ****
void NewClassCmd::execute(Editor* editor){
! debug("CreateClassCmd->Execute called (Not yet implemented!)");
}
void NewClassCmd::undo(){
! debug("CreateClassCmd->Undo called (Not yet implemented!)");
}
class View;
--- 22,29 ----
void NewClassCmd::execute(Editor* editor){
! qDebug("CreateClassCmd->Execute called (Not yet implemented!)");
}
void NewClassCmd::undo(){
! qDebug("CreateClassCmd->Undo called (Not yet implemented!)");
}
class View;
Index: NewClassDiagramCmd.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/extensions/uml/commands/NewClassDiagramCmd.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** NewClassDiagramCmd.cpp 2001/06/20 19:21:10 1.1.1.1
--- NewClassDiagramCmd.cpp 2001/07/20 15:57:29 1.2
***************
*** 24,31 ****
void NewClassDiagramCmd::undo(){
! debug("NewClassDiagramCmd->Undo called (Not yet implemented!)");
}
void NewClassDiagramCmd::execute(Editor* editor){
! debug("NewClassDiagramCmd->Execute called (Not yet implemented!)");
}
NewClassDiagramCmd::~NewClassDiagramCmd(){}
--- 24,31 ----
void NewClassDiagramCmd::undo(){
! qDebug("NewClassDiagramCmd->Undo called (Not yet implemented!)");
}
void NewClassDiagramCmd::execute(Editor* editor){
! qDebug("NewClassDiagramCmd->Execute called (Not yet implemented!)");
}
NewClassDiagramCmd::~NewClassDiagramCmd(){}
Index: NewGeneralizationCmd.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/extensions/uml/commands/NewGeneralizationCmd.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** NewGeneralizationCmd.cpp 2001/06/20 19:21:10 1.1.1.1
--- NewGeneralizationCmd.cpp 2001/07/20 15:57:29 1.2
***************
*** 22,29 ****
void NewGeneralizationCmd::undo(){
! debug("CreateGeneralizationCmd->Undo called (Not yet implemented!)");
}
void NewGeneralizationCmd::execute(Editor* editor){
! debug("CreateGeneralizationCmd->Execute called (Not yet implemented!)");
}
View * NewGeneralizationCmd::createView(){}
--- 22,29 ----
void NewGeneralizationCmd::undo(){
! qDebug("CreateGeneralizationCmd->Undo called (Not yet implemented!)");
}
void NewGeneralizationCmd::execute(Editor* editor){
! qDebug("CreateGeneralizationCmd->Execute called (Not yet implemented!)");
}
View * NewGeneralizationCmd::createView(){}
|
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:
|
|
From: Darius S. <dst...@us...> - 2001-07-20 15:57:32
|
Update of /cvsroot/kuml/kuml/kuml_gui/src/ige In directory usw-pr-cvs1:/tmp/cvs-serv28950 Modified Files: Makefile ige.pro Log Message: A Viewer can paint its layers now Index: Makefile =================================================================== RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** Makefile 2001/07/12 11:03:07 1.2 --- Makefile 2001/07/20 15:57:28 1.3 *************** *** 1,9 **** ############################################################################# # Makefile for building libige.so.1.0.0 ! # Generated by tmake at 12:55, 2001/07/07 # Project: ige # Template: lib ############################################################################# ####### Compiler, tools and options --- 1,10 ---- ############################################################################# # Makefile for building libige.so.1.0.0 ! # Generated by tmake at 15:39, 2001/07/18 # Project: ige # Template: lib ############################################################################# + QTDIR = /usr/lib/qt2 ####### Compiler, tools and options *************** *** 11,15 **** CXX = g++ CFLAGS = -pipe -fPIC -DNO_DEBUG ! CXXFLAGS= -g0 -fPIC -DNO_DEBUG INCPATH = -I.. -I$(QTDIR)/include LINK = g++ --- 12,16 ---- CXX = g++ CFLAGS = -pipe -fPIC -DNO_DEBUG ! CXXFLAGS= -g3 -fPIC -DNO_DEBUG INCPATH = -I.. -I$(QTDIR)/include LINK = g++ Index: ige.pro =================================================================== RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/ige.pro,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** ige.pro 2001/07/12 11:03:07 1.2 --- ige.pro 2001/07/20 15:57:28 1.3 *************** *** 1,4 **** TEMPLATE = lib ! TMAKE_CXXFLAGS = -g0 INCLUDEPATH = ../ CONFIG = qt warn_off --- 1,4 ---- TEMPLATE = lib ! TMAKE_CXXFLAGS = -g3 INCLUDEPATH = ../ CONFIG = qt warn_off |
|
From: Darius S. <dst...@us...> - 2001-07-20 15:57:32
|
Update of /cvsroot/kuml/kuml/kuml_gui/src/ige/extensions/net/documents
In directory usw-pr-cvs1:/tmp/cvs-serv28950/extensions/net/documents
Modified Files:
GraphDocument.h
Log Message:
A Viewer can paint its layers now
Index: GraphDocument.h
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/extensions/net/documents/GraphDocument.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** GraphDocument.h 2001/06/20 19:21:14 1.1.1.1
--- GraphDocument.h 2001/07/20 15:57:29 1.2
***************
*** 21,25 ****
--- 21,28 ----
#include "ige/common/documents/AbstractDocument.h"
+ /** This class will become obsolete */
class GraphDocument : public AbstractDocument {
+ public:
+ GraphDocument() : AbstractDocument(0) {}
};
#endif //GRAPHDOCUMENT_H
|
|
From: Darius S. <dst...@us...> - 2001-07-18 14:19:36
|
Update of /cvsroot/kuml/kuml/kuml_gui/src/ige/common/editors
In directory usw-pr-cvs1:/tmp/cvs-serv11293
Modified Files:
AbstractEditor.cpp
Log Message:
Fixed usage of STL strings
Index: AbstractEditor.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/common/editors/AbstractEditor.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** AbstractEditor.cpp 2001/06/20 19:21:19 1.1.1.1
--- AbstractEditor.cpp 2001/07/18 14:19:31 1.2
***************
*** 91,97 ****
}
void AbstractEditor::execute(EditorCommand* cmd) {
- debug(string("Editor is executing command: " + cmd->getDescription()).begin());
-
CHECK_PTR(cmd);
cmd->execute(this);
commandHistory.push(cmd);
--- 91,98 ----
}
void AbstractEditor::execute(EditorCommand* cmd) {
CHECK_PTR(cmd);
+
+ debug(string("Editor is executing command: " + cmd->getDescription()).c_str());
+
cmd->execute(this);
commandHistory.push(cmd);
***************
*** 99,107 ****
}
void AbstractEditor::undo(){
-
EditorCommand *cmd = commandHistory.pop();
CHECK_PTR(cmd);
! debug(string("Editor is undoing command: " + cmd->getDescription()).begin());
cmd->undo();
delete cmd;
--- 100,108 ----
}
void AbstractEditor::undo(){
EditorCommand *cmd = commandHistory.pop();
CHECK_PTR(cmd);
!
! debug(string("Editor is undoing command: " + cmd->getDescription()).c_str());
cmd->undo();
delete cmd;
|
|
From: Gerard F. <ger...@us...> - 2001-07-15 11:14:34
|
Update of /cvsroot/kuml/kuml/libkuml/mof
In directory usw-pr-cvs1:/tmp/cvs-serv19080
Modified Files:
Autogen.cpp ChangeLog Generic.cpp Generic.hh Makefile
MetaModelManager.cpp MetaModelManager.hh MofIdlInterfaces.cpp
MofIdlInterfaces.hh MofIdlReverseMapper.cpp
MofIdlReverseMapper.hh Reflective_impl.cc RepoManager.cpp
RepoManager.hh RepoManager.t.cpp mCorba.cpp mCorba.hh
notes.txt
Log Message:
2001-7-15 Gerard Flynn <ger...@fr...>
* Hacked GenericStructuralFeature::checkType to always return true for
tk_objref's. Type checking for this case will need to be implemented
based on meta-object MOF ID's rather than TypeCode's.
* Fixed bug in GenericValueCollector::find_by_name and
find_by_mof_id, now return null pointer if not found
* Modified GenericBaseObject constructor to create its RefBaseObject
object reference
* Fixed order of ChangeLog
* Added GenericPOAManager singleton class
* Added initializePOA method to RepoManager
* Removed compilation of Generic.t, Autotest.t and MofIdlMapping.t
from Makefile
VS: Committing in .
VS:
VS: Modified Files:
VS: Autogen.cpp ChangeLog Generic.cpp Generic.hh Makefile
VS: MetaModelManager.cpp MetaModelManager.hh MofIdlInterfaces.cpp
VS: MofIdlInterfaces.hh MofIdlReverseMapper.cpp
VS: MofIdlReverseMapper.hh Reflective_impl.cc RepoManager.cpp
VS: RepoManager.hh RepoManager.t.cpp mCorba.cpp mCorba.hh
VS: notes.txt
VS: ----------------------------------------------------------------------
Index: Autogen.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/mof/Autogen.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Autogen.cpp 2001/06/30 07:31:26 1.2
--- Autogen.cpp 2001/07/15 11:14:31 1.3
***************
*** 24,30 ****
/* ****************************************************************************/
! /* $Header$ */
!
! // $Id$
#include "Autogen.hh"
--- 24,30 ----
/* ****************************************************************************/
! /*
! $Header$
! */
#include "Autogen.hh"
Index: ChangeLog
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/mof/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ChangeLog 2001/07/02 21:26:22 1.3
--- ChangeLog 2001/07/15 11:14:31 1.4
***************
*** 1,12 ****
! 2001-6-22 Gerard Flynn <ger...@fr...>
! * Initial checkin
! * The code currently dies while trying to instantiate meta objects for the MOF
! Reflective implementation
! 2001-6-25 Gerard Flynn <ger...@fr...>
! * Fixed MofIdlMapping::InterfaceReverseMapper to preserve attribute ordering
! by adding attribute vector in addition to attribute map
! * Hacked MofIdlMapping::InterfaceReverseMapper::createObject to skip
! attributes of type CORBA::tk_objref, assume these are References
2001-6-30 Gerard Flynn <ger...@fr...>
--- 1,27 ----
! $Header$
! 2001-7-15 Gerard Flynn <ger...@fr...>
! * Hacked GenericStructuralFeature::checkType to always return true for
! tk_objref's. Type checking for this case will need to be implemented
! based on meta-object MOF ID's rather than TypeCode's.
! * Fixed bug in GenericValueCollector::find_by_name and
! find_by_mof_id, now return null pointer if not found
! * Modified GenericBaseObject constructor to create its RefBaseObject
! object reference
! * Fixed order of ChangeLog
! * Added GenericPOAManager singleton class
! * Added initializePOA method to RepoManager
! * Removed compilation of Generic.t, Autotest.t and MofIdlMapping.t
! from Makefile
!
! 2001-7-2 Gerard Flynn <ger...@fr...>
! * Added MetaModelManager class
! * Added createMetaModel and fillInMetaModel virtual methods to
! GenericBaseObject, meta model creation is now driven from the
! package level on down
! * Rearranged RepoManager buildImplementation code
! * Added handling of References to InterfaceReverseMapper (we assume
! anything with a type of tk_objref is a Reference)
! * Added meta object creation for Packages
2001-6-30 Gerard Flynn <ger...@fr...>
***************
*** 21,31 ****
* Began work on mCorba::showTC function for TypeCode display
! 2001-7-2 Gerard Flynn <ger...@fr...>
! * Added MetaModelManager class
! * Added createMetaModel and fillInMetaModel virtual methods to
! GenericBaseObject, meta model creation is now driven from the
! package level on down
! * Rearranged RepoManager buildImplementation code
! * Added handling of References to InterfaceReverseMapper (we assume
! anything with a type of tk_objref is a Reference)
! * Added meta object creation for Packages
\ No newline at end of file
--- 36,50 ----
* Began work on mCorba::showTC function for TypeCode display
! 2001-6-25 Gerard Flynn <ger...@fr...>
! * Fixed MofIdlMapping::InterfaceReverseMapper to preserve attribute ordering
! by adding attribute vector in addition to attribute map
! * Hacked MofIdlMapping::InterfaceReverseMapper::createObject to skip
! attributes of type CORBA::tk_objref, assume these are References
!
! 2001-6-22 Gerard Flynn <ger...@fr...>
! * Initial checkin
! * The code currently dies while trying to instantiate meta objects for the MOF
! Reflective implementation
!
!
!
Index: Generic.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/mof/Generic.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Generic.cpp 2001/07/02 21:26:22 1.3
--- Generic.cpp 2001/07/15 11:14:31 1.4
***************
*** 24,28 ****
/* ****************************************************************************/
! /* $Header$ */
#include "Generic.hh"
--- 24,30 ----
/* ****************************************************************************/
! /*
! $Header$
[...471 lines suppressed...]
if( !p_feature->checkType( new_element ) ) {
+ cerr << "Wrong type in GenericValue::add_value_at" << endl;
throw GenericException( INVALID_PARAMETER );
}
***************
*** 1365,1368 ****
--- 1581,1585 ----
}
if( !p_feature->checkType( new_element ) ) {
+ cerr << "Wrong type in GenericValue::modify_value" << endl;
throw GenericException( INVALID_PARAMETER );
}
***************
*** 1388,1391 ****
--- 1605,1609 ----
}
if( !p_feature->checkType( new_element ) ) {
+ cerr << "Wrong type in GenericValue::modify_value_at" << endl;
throw GenericException( INVALID_PARAMETER );
}
Index: Generic.hh
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/mof/Generic.hh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Generic.hh 2001/07/02 21:26:22 1.3
--- Generic.hh 2001/07/15 11:14:31 1.4
***************
*** 24,28 ****
/* ****************************************************************************/
! /* $Header$ */
#ifndef Generic_H_IS_INCLUDED
--- 24,30 ----
/* ****************************************************************************/
! /*
! $Header$
! */
#ifndef Generic_H_IS_INCLUDED
***************
*** 67,70 ****
--- 69,73 ----
}
+ #include "mCorba.hh"
#include "Reflective.h"
#include "Reflective_impl.h"
***************
*** 104,107 ****
--- 107,130 ----
};
+ /**
+ Singelton class to provide POA for the Generic classes.
+ */
+ class GenericPOAManager
+ {
+ public:
+ static GenericPOAManager* thePOAManager();
+
+ void setPOA( PortableServer::POA_ptr poa );
+
+ PortableServer::POA_ptr getPOA();
+
+ private:
+ GenericPOAManager();
+
+ static GenericPOAManager* s_thePOAManager;
+
+ PortableServer::POA_ptr p_poa;
+ }; // class GenericPOAManager.
+
class GenericBaseObject
{
***************
*** 119,123 ****
virtual void createMetaObject( GenericClassProxy* meta_class );
! void set_ref_object( RefBaseObject_impl* ref_object );
void set_meta_object( GenericInstance* meta_object );
--- 142,146 ----
virtual void createMetaObject( GenericClassProxy* meta_class );
! // void set_ref_object( RefBaseObject_impl* ref_object );
void set_meta_object( GenericInstance* meta_object );
***************
*** 131,135 ****
const string& name() const;
! RefBaseObject_impl* ref_object();
GenericInstance* ref_meta_object();
--- 154,158 ----
const string& name() const;
! Reflective::RefBaseObject_ptr ref_object();
GenericInstance* ref_meta_object();
***************
*** 138,151 ****
protected:
! GenericInstance* p_meta_object;
private:
! mutable uuid_t m_uuid;
! string m_name;
! RefBaseObject_impl* p_ref_object;
! bool m_closed;
};
--- 161,174 ----
protected:
! GenericInstance* p_meta_object;
private:
! mutable uuid_t m_uuid;
! string m_name;
! Reflective::RefBaseObject_var p_ref_object;
! bool m_closed;
};
***************
*** 187,190 ****
--- 210,224 ----
virtual void fillInMetaModel();
+
+ void setAnnotation( const string& annotation ) { m_annotation = annotation; }
+
+ void setIsLeaf( bool isLeaf ) { m_isLeaf = isLeaf; }
+
+ void setIsAbstract( bool isAbstract ) { m_isAbstract = isAbstract; }
+
+ void setIsSingelton( bool isSingleton ) { m_isSingleton = isSingleton; }
+
+ void setVisibility( visibilityKind visibility ) { m_visibility = visibility; }
+
public: // Non-MOF accessors.
GenericClassProxy* classProxy( const string& name );
***************
*** 242,245 ****
--- 276,291 ----
static packageMap s_topLevelPackages;
+
+ string m_annotation;
+
+ bool m_isRoot;
+
+ bool m_isLeaf;
+
+ bool m_isAbstract;
+
+ bool m_isSingleton;
+
+ visibilityKind m_visibility;
};
Index: Makefile
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/mof/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Makefile 2001/07/02 21:26:22 1.3
--- Makefile 2001/07/15 11:14:31 1.4
***************
*** 9,35 ****
CPPFLAGS = ${CXXFLAGS}
! all : Generic.t MofIdlMapping.t RegularExpression.t RepoManager.t
! Generic.t : Generic.t.o Generic.o Reflective.o Reflective_impl.o GenericTest.o GenericTest.h \
! mCorba.o MetaModelManager.o
! g++ -o Generic.t Generic.t.o Generic.o Reflective_impl.o Reflective.o GenericTest.o \
! mCorba.o MetaModelManager.o ${LIBS}
! Generic.t.cpp : GenericTest.h Generic.hh Reflective_impl.h
scanner.cc : scanner.ll yacc.cc yacc.h
flex -oscanner.cc scanner.ll
! Autotest.t : Autotest.t.o Autogen.o InterfaceGen.o parsenode.o prepro.o scanner.o \
! parser.o treewalker.o Reflective.o Reflective_impl.o Generic.o mCorba.o \
! yacc.o MetaModelManager.o
! g++ -o $@ $^ ${LIBS}
!
! MofIdlMapping_t_OBJECTS = MofIdlInterfaces.o MofIdlReverseMapper.o MofIdlMapping.t.o \
! Generic.o Reflective_impl.o Reflective.o mCorba.o KumlUtilities.o MetaModelManager.o \
! Autogen.o parsenode.o prepro.o scanner.o parser.o treewalker.o yacc.o
! MofIdlMapping.t : ${MofIdlMapping_t_OBJECTS}
! g++ -o $@ $^ ${LIBS}
RepoManager_t_OBJECTS = RepoManager.t.o RepoManager.o MofIdlInterfaces.o \
--- 9,35 ----
CPPFLAGS = ${CXXFLAGS}
! all : RegularExpression.t RepoManager.t
! #Generic.t : Generic.t.o Generic.o Reflective.o Reflective_impl.o GenericTest.o GenericTest.h \
! #mCorba.o MetaModelManager.o
! # g++ -o Generic.t Generic.t.o Generic.o Reflective_impl.o Reflective.o GenericTest.o \
! # mCorba.o MetaModelManager.o ${LIBS}
! #Generic.t.cpp : GenericTest.h Generic.hh Reflective_impl.h
scanner.cc : scanner.ll yacc.cc yacc.h
flex -oscanner.cc scanner.ll
! #Autotest.t : Autotest.t.o Autogen.o InterfaceGen.o parsenode.o prepro.o scanner.o \
! #parser.o treewalker.o Reflective.o Reflective_impl.o Generic.o mCorba.o \
! #yacc.o MetaModelManager.o
! # g++ -o $@ $^ ${LIBS}
!
! #MofIdlMapping_t_OBJECTS = MofIdlInterfaces.o MofIdlReverseMapper.o MofIdlMapping.t.o \
! #Generic.o Reflective_impl.o Reflective.o mCorba.o KumlUtilities.o MetaModelManager.o \
! #Autogen.o parsenode.o prepro.o scanner.o parser.o treewalker.o yacc.o
! #MofIdlMapping.t : ${MofIdlMapping_t_OBJECTS}
! # g++ -o $@ $^ ${LIBS}
RepoManager_t_OBJECTS = RepoManager.t.o RepoManager.o MofIdlInterfaces.o \
***************
*** 94,98 ****
rm -f yacc.cc.output
! OBJECTS = ${MofIdlMapping_t_OBJECTS}
include $(OBJECTS:.o=.d)
--- 94,98 ----
rm -f yacc.cc.output
! OBJECTS = ${RepoManager_t_OBJECTS}
include $(OBJECTS:.o=.d)
Index: MetaModelManager.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/mof/MetaModelManager.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** MetaModelManager.cpp 2001/07/02 21:26:22 1.1
--- MetaModelManager.cpp 2001/07/15 11:14:31 1.2
***************
*** 24,28 ****
/* ****************************************************************************/
! /* $Header$ */
#include "MetaModelManager.hh"
--- 24,30 ----
/* ****************************************************************************/
! /*
! $Header$
! */
#include "MetaModelManager.hh"
Index: MetaModelManager.hh
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/mof/MetaModelManager.hh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** MetaModelManager.hh 2001/07/02 21:26:22 1.1
--- MetaModelManager.hh 2001/07/15 11:14:31 1.2
***************
*** 24,28 ****
/* ****************************************************************************/
! /* $Header$ */
#ifndef MetaModelManager_H_IS_INCLUDED
--- 24,30 ----
/* ****************************************************************************/
! /*
! $Header$
! */
#ifndef MetaModelManager_H_IS_INCLUDED
Index: MofIdlInterfaces.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/mof/MofIdlInterfaces.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** MofIdlInterfaces.cpp 2001/06/30 07:31:26 1.2
--- MofIdlInterfaces.cpp 2001/07/15 11:14:31 1.3
***************
*** 24,28 ****
/* ****************************************************************************/
! /* $Header$*/
#include "MofIdlInterfaces.hh"
--- 24,30 ----
/* ****************************************************************************/
! /*
! $Header$
! */
#include "MofIdlInterfaces.hh"
Index: MofIdlInterfaces.hh
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/mof/MofIdlInterfaces.hh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** MofIdlInterfaces.hh 2001/06/30 07:31:26 1.2
--- MofIdlInterfaces.hh 2001/07/15 11:14:31 1.3
***************
*** 24,28 ****
/* ****************************************************************************/
! /* $Header$*/
#ifndef MofIdlInterfaces_H_IS_INCLUDED
--- 24,30 ----
/* ****************************************************************************/
! /*
! $Header$
! */
#ifndef MofIdlInterfaces_H_IS_INCLUDED
Index: MofIdlReverseMapper.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/mof/MofIdlReverseMapper.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** MofIdlReverseMapper.cpp 2001/07/02 21:26:22 1.3
--- MofIdlReverseMapper.cpp 2001/07/15 11:14:31 1.4
***************
*** 24,28 ****
/* ****************************************************************************/
! /* $Header$ */
#include "MofIdlReverseMapper.hh"
--- 24,30 ----
/* ****************************************************************************/
! /*
! $Header$
! */
#include "MofIdlReverseMapper.hh"
Index: MofIdlReverseMapper.hh
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/mof/MofIdlReverseMapper.hh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** MofIdlReverseMapper.hh 2001/06/30 07:31:26 1.2
--- MofIdlReverseMapper.hh 2001/07/15 11:14:31 1.3
***************
*** 24,28 ****
/* ****************************************************************************/
! /* $Header$ */
#ifndef MofIdlReverseMapper_H_IS_INCLUDED
--- 24,30 ----
/* ****************************************************************************/
! /*
! $Header$
! */
#ifndef MofIdlReverseMapper_H_IS_INCLUDED
Index: Reflective_impl.cc
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/mof/Reflective_impl.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Reflective_impl.cc 2001/07/02 21:26:22 1.2
--- Reflective_impl.cc 2001/07/15 11:14:31 1.3
***************
*** 24,28 ****
/* ****************************************************************************/
! /* $Header$ */
--- 24,30 ----
/* ****************************************************************************/
! /*
! $Header$
! */
***************
*** 62,74 ****
}
! RefBaseObject_impl* meta_object_servant =
! meta_object->ref_object();
! if( ! meta_object_servant ) {
! return Reflective::DesignatorType::_nil();
! }
Reflective::RefBaseObject_var base_object =
! Reflective::RefBaseObject::_duplicate( meta_object_servant->_this() );
retval = Reflective::DesignatorType::_narrow( base_object.in() );
--- 64,76 ----
}
! // RefBaseObject_impl* meta_object_servant =
! // meta_object->ref_object();
! // if( ! meta_object_servant ) {
! // return Reflective::DesignatorType::_nil();
! // }
Reflective::RefBaseObject_var base_object =
! Reflective::RefBaseObject::_duplicate( meta_object->ref_object() );
retval = Reflective::DesignatorType::_narrow( base_object.in() );
Index: RepoManager.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/mof/RepoManager.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** RepoManager.cpp 2001/07/02 21:26:22 1.3
--- RepoManager.cpp 2001/07/15 11:14:31 1.4
***************
*** 24,28 ****
/* ****************************************************************************/
! /* $Header$ */
#include "RepoManager.hh"
--- 24,30 ----
/* ****************************************************************************/
! /*
! $Header$
! */
#include "RepoManager.hh"
***************
*** 38,42 ****
p_inputFile(0),
p_metaModelMgr(0)
! {}
void RepoManager::setIDLInputFile( FILE* inputFile )
--- 40,46 ----
p_inputFile(0),
p_metaModelMgr(0)
! {
! initializePOA();
! }
void RepoManager::setIDLInputFile( FILE* inputFile )
***************
*** 72,75 ****
--- 76,81 ----
buildMetaModel();
+
+ cerr << "End RepoManager::buildImplementation" << endl;
}
***************
*** 95,98 ****
--- 101,135 ----
cerr << "End RepoManager::buildMetaModel" << endl;
+ }
+
+ void RepoManager::initializePOA()
+ {
+ // Create the POA used by the Repository.
+
+ // Explicitly assign all policies:
+ CORBA::PolicyList policy_list;
+ policy_list.length( 7 );
+ policy_list[0] =
+ PortableServer::LifespanPolicy::_duplicate( mCorba::policy_transient() );
+ policy_list[1] =
+ PortableServer::IdAssignmentPolicy::_duplicate( mCorba::policy_system() );
+ policy_list[2] =
+ PortableServer::IdUniquenessPolicy::_duplicate(mCorba::policy_unique() );
+ policy_list[3] =
+ PortableServer::ImplicitActivationPolicy::_duplicate( mCorba::policy_no_implicit() );
+ policy_list[4] =
+ PortableServer::RequestProcessingPolicy::_duplicate( mCorba::policy_aom() );
+ policy_list[5] =
+ PortableServer::ServantRetentionPolicy::_duplicate( mCorba::policy_retain() );
+ policy_list[6] =
+ PortableServer::ThreadPolicy::_duplicate( mCorba::policy_single_thread() );
+
+ PortableServer::POA_var poa =
+ mCorba::poa_racine->create_POA( "RepoPOA",
+ mCorba::poa_mgr.in(),
+ policy_list );
+
+ assert( !CORBA::is_nil( poa.in() ) );
+ GenericPOAManager::thePOAManager()->setPOA( poa.in() );
}
Index: RepoManager.hh
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/mof/RepoManager.hh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** RepoManager.hh 2001/07/02 21:26:22 1.3
--- RepoManager.hh 2001/07/15 11:14:31 1.4
***************
*** 32,35 ****
--- 32,36 ----
#include "Autogen.hh"
#include "MetaModelManager.hh"
+ #include "mCorba.hh"
enum stageType {
***************
*** 55,58 ****
--- 56,61 ----
void activateRepository();
private:
+ void initializePOA();
+
void buildMetaModel();
private:
Index: RepoManager.t.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/mof/RepoManager.t.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** RepoManager.t.cpp 2001/06/30 07:31:26 1.2
--- RepoManager.t.cpp 2001/07/15 11:14:31 1.3
***************
*** 24,28 ****
/* ****************************************************************************/
! /* $Header$ */
#include "RepoManager.hh"
--- 24,30 ----
/* ****************************************************************************/
! /*
! $Header$
! */
#include "RepoManager.hh"
Index: mCorba.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/mof/mCorba.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** mCorba.cpp 2001/06/30 07:31:26 1.2
--- mCorba.cpp 2001/07/15 11:14:31 1.3
***************
*** 24,28 ****
/* ****************************************************************************/
! /* $Header$ */
#include "mCorba.hh"
--- 24,30 ----
/* ****************************************************************************/
! /*
! $Header$
! */
#include "mCorba.hh"
Index: mCorba.hh
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/mof/mCorba.hh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** mCorba.hh 2001/06/30 07:31:26 1.2
--- mCorba.hh 2001/07/15 11:14:31 1.3
***************
*** 24,28 ****
/* ****************************************************************************/
! /* $Header$ */
#ifndef mCorba_H_IS_INCLUDED
--- 24,30 ----
/* ****************************************************************************/
! /*
! $Header$
! */
#ifndef mCorba_H_IS_INCLUDED
***************
*** 49,53 ****
public:
! static void init( int argc = 0, char* argv[] = 0 );
static void initOrb( int argc = 0, char* argv[] = 0 );
--- 51,55 ----
public:
! static void init( int argc = 0, char* argv[] = 0 );
static void initOrb( int argc = 0, char* argv[] = 0 );
Index: notes.txt
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/mof/notes.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** notes.txt 2001/07/02 21:26:22 1.3
--- notes.txt 2001/07/15 11:14:31 1.4
***************
*** 179,181 ****
and Associations it contains. This may require a more general method
for passing in the meta-model than simply passing a GenericClassProxy
! object.
\ No newline at end of file
--- 179,187 ----
and Associations it contains. This may require a more general method
for passing in the meta-model than simply passing a GenericClassProxy
! object.
!
! 2001-7-6
! Note: had problems with creation of RefBaseObject object refs
! because version string not specified in RepoId. Seems to work when
! version is specified. However this seems to be in contradiction with
! what I had seen in the case of Dynamic Any typecodes.
\ No newline at end of file
|
|
From: Darius S. <dst...@us...> - 2001-07-12 11:03:12
|
Update of /cvsroot/kuml/kuml/kuml_gui/src/ige In directory usw-pr-cvs1:/tmp/cvs-serv1225 Modified Files: ige.pro Makefile Log Message: Changed to build a dynamic lib instead of a static one Index: ige.pro =================================================================== RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/ige.pro,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** ige.pro 2001/06/20 19:21:07 1.1.1.1 --- ige.pro 2001/07/12 11:03:07 1.2 *************** *** 2,6 **** TMAKE_CXXFLAGS = -g0 INCLUDEPATH = ../ ! CONFIG = qt warn_off staticlib HEADERS = common/EventHandler.h \ --- 2,6 ---- TMAKE_CXXFLAGS = -g0 INCLUDEPATH = ../ ! CONFIG = qt warn_off HEADERS = common/EventHandler.h \ Index: Makefile =================================================================== RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** Makefile 2001/06/20 19:21:09 1.1.1.1 --- Makefile 2001/07/12 11:03:07 1.2 *************** *** 1,5 **** ############################################################################# ! # Makefile for building libige.a ! # Generated by tmake at 21:00, 2001/06/20 # Project: ige # Template: lib --- 1,5 ---- ############################################################################# ! # Makefile for building libige.so.1.0.0 ! # Generated by tmake at 12:55, 2001/07/07 # Project: ige # Template: lib *************** *** 10,16 **** CC = gcc CXX = g++ ! CFLAGS = -pipe -DNO_DEBUG ! CXXFLAGS= -g0 -DNO_DEBUG INCPATH = -I.. -I$(QTDIR)/include AR = ar cqs RANLIB = --- 10,19 ---- CC = gcc CXX = g++ ! CFLAGS = -pipe -fPIC -DNO_DEBUG ! CXXFLAGS= -g0 -fPIC -DNO_DEBUG INCPATH = -I.. -I$(QTDIR)/include + LINK = g++ + LFLAGS = -shared -Wl,-soname,libige.so.1 + LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt -lXext -lX11 -lm AR = ar cqs RANLIB = *************** *** 326,330 **** common/editors/moc_DoubleBufferViewer.o DIST = ! TARGET = libige.a INTERFACE_DECL_PATH = . --- 329,338 ---- common/editors/moc_DoubleBufferViewer.o DIST = ! TARGET = libige.so.1.0.0 ! TARGETA = libige.a ! TARGETD = libige.so.1.0.0 ! TARGET0 = libige.so ! TARGET1 = libige.so.1 ! TARGET2 = libige.so.1.0 INTERFACE_DECL_PATH = . *************** *** 353,362 **** all: $(TARGET) ! staticlib: $(TARGET) - $(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) - -rm -f $(TARGET) - $(AR) $(TARGET) $(OBJECTS) $(OBJMOC) - moc: $(SRCMOC) --- 361,377 ---- all: $(TARGET) ! $(TARGET): $(OBJECTS) $(OBJMOC) $(SUBLIBS) ! -rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) ! $(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS) ! -ln -s $(TARGET) $(TARGET0) ! -ln -s $(TARGET) $(TARGET1) ! -ln -s $(TARGET) $(TARGET2) ! ! staticlib: $(TARGETA) ! ! $(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) ! -rm -f $(TARGETA) ! $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC) moc: $(SRCMOC) *************** *** 372,375 **** --- 387,391 ---- clean: -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET) + -rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA) -rm -f *~ core |
|
From: Chris M. <zm...@us...> - 2001-07-09 22:38:32
|
Update of /cvsroot/kuml/kuml/libkuml/uml/tools
In directory usw-pr-cvs1:/tmp/cvs-serv28251/tools
Modified Files:
common_code.xsl gen_class_ccs.xsl
Log Message:
References need work but almost there.
Index: common_code.xsl
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/uml/tools/common_code.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** common_code.xsl 2001/06/18 22:57:27 1.5
--- common_code.xsl 2001/07/09 22:38:30 1.6
***************
*** 49,54 ****
--- 49,58 ----
<xsl:choose>
+ <!-- If $letter is uppercase... -->
<xsl:when test='not(boolean(translate($letter, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "")))'>
+ <!-- Calculate the new string with the _ inserted and
+ the current letter in lowercase.
+ Unless we're at the 1st letter (don't want _text) -->
<xsl:variable name="new_string">
<xsl:value-of select='substring($text, 1, $position - 1)'/>
***************
*** 62,70 ****
</xsl:variable>
<xsl:call-template name="to_name">
<xsl:with-param name="text">
<xsl:value-of select="$new_string"/>
</xsl:with-param>
! <xsl:with-param name="position" select="$position + 2"/>
</xsl:call-template>
--- 66,88 ----
</xsl:variable>
+ <!-- Calculate the next position to be considered,
+ depending on whether we inserted an _ or not. -->
+ <xsl:variable name="new_position">
+ <xsl:choose>
+ <xsl:when test='$position=1'>
+ <xsl:value-of select="$position + 1"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$position + 2"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <!-- Recurse! -->
<xsl:call-template name="to_name">
<xsl:with-param name="text">
<xsl:value-of select="$new_string"/>
</xsl:with-param>
! <xsl:with-param name="position" select="$new_position"/>
</xsl:call-template>
***************
*** 73,76 ****
--- 91,95 ----
<xsl:otherwise>
+ <!-- Recurse passing current letter through. -->
<xsl:call-template name="to_name">
<xsl:with-param name="text">
Index: gen_class_ccs.xsl
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/uml/tools/gen_class_ccs.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** gen_class_ccs.xsl 2001/06/18 22:57:27 1.3
--- gen_class_ccs.xsl 2001/07/09 22:38:30 1.4
***************
*** 289,292 ****
--- 289,306 ----
-->
+ <xsl:text> void </xsl:text>
+ <xsl:value-of select="$class_name"/>
+ <xsl:text>_impl::set_</xsl:text>
+ <xsl:value-of select="$attr_name"/>
+ <xsl:text>( const </xsl:text>
+ <xsl:value-of select="$CORBA_type"/>
+ <xsl:text>Set& new_value ) </xsl:text>
[...710 lines suppressed...]
+ <xsl:text> ::Reflective::MofError) </xsl:text>
+
+ <xsl:text>{ Reflective::RefPackage_ptr rp = _this()->ref_immediate_package(); </xsl:text>
+ <xsl:text> Core::CorePackage_ptr cp = Core::CorePackage::_narrow(rp); </xsl:text>
+
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="$package_name"/>
+ <xsl:text>::</xsl:text>
+ <xsl:value-of select="$assoc_name"/>
+ <xsl:text>_ptr assoc_proxy = cp-></xsl:text>
+ <xsl:value-of select="$lc_assoc_name"/>
+ <xsl:text>_ref(); </xsl:text>
+
+ <xsl:text> assoc_proxy->remove( old_element, _this() ); </xsl:text>
+
+ <xsl:text>} </xsl:text>
+
+ <xsl:text> </xsl:text>
</xsl:if>
|
|
From: Darius S. <dst...@us...> - 2001-07-08 16:18:45
|
Update of /cvsroot/kuml/kuml/kuml_gui/src/editorapp/editorapp In directory usw-pr-cvs1:/tmp/cvs-serv2874 Added Files: .cvsignore Log Message: Added --- NEW FILE --- *.moc.* |
|
From: Darius S. <dst...@us...> - 2001-07-08 16:18:13
|
Update of /cvsroot/kuml/kuml/kuml_gui/src/editorapp In directory usw-pr-cvs1:/tmp/cvs-serv2732 Added Files: .cvsignore Log Message: Added --- NEW FILE --- *bernd build buildpackage configure config.h Makefile Makefile.in libtool stamp-h stamp-h.in aclocal.m4 *.moc.* |
|
From: Darius S. <dst...@us...> - 2001-07-08 16:13:09
|
Update of /cvsroot/kuml/kuml/kuml_gui/src/ige In directory usw-pr-cvs1:/tmp/cvs-serv1565 Modified Files: readme.txt Log Message: Updated Index: readme.txt =================================================================== RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/readme.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** readme.txt 2001/07/08 12:48:57 1.2 --- readme.txt 2001/07/08 16:13:07 1.3 *************** *** 4,7 **** --- 4,10 ---- Last updated on 2001-07-08 + This file gives you some information on the interactive graphical editor + (IGE) for kUML. + You can use the provided makefile to build the sources or create a new one with tmake from TrollTech. It's a free tool and can be download at www.troll.no. *************** *** 10,13 **** --- 13,21 ---- tmake ige.pro -o Makefile + The framework is build as a dynamic library now. This will reduce the turn + around times while development. There is a test application that dynamic + link against the framework and starts it. + + Remark: tmake assumes that the environment variable QTDIR is pointing to the root path *************** *** 15,24 **** If you use Mandrake Linux you may encounter problems with unset environment ! variables like QTDIR and KDEDIR. The generated makefile make use of QTDIR and therefore it must be set in order to compile the sources without errors. I've written a small script workaround that sets this variable and starts the make process. You may use it if you share my problem. - Darius Stachow <sta...@in...> --- 23,31 ---- If you use Mandrake Linux you may encounter problems with unset environment ! variables like QTDIR and KDEDIR. The generated makefile makes use of QTDIR and therefore it must be set in order to compile the sources without errors. I've written a small script workaround that sets this variable and starts the make process. You may use it if you share my problem. Darius Stachow <sta...@in...> |
|
From: Darius S. <dst...@us...> - 2001-07-08 16:01:55
|
Update of /cvsroot/kuml/kuml/kuml_gui/src/editorapp In directory usw-pr-cvs1:/tmp/cvs-serv31081 Log Message: Imported sources Status: Vendor Tag: dstachow Release Tags: start N kuml/kuml_gui/src/editorapp/Makefile.am N kuml/kuml_gui/src/editorapp/Makefile.dist N kuml/kuml_gui/src/editorapp/configure.in N kuml/kuml_gui/src/editorapp/acinclude.m4 N kuml/kuml_gui/src/editorapp/editorapp.kdevprj N kuml/kuml_gui/src/editorapp/aclocal.m4 N kuml/kuml_gui/src/editorapp/stamp-h.in N kuml/kuml_gui/src/editorapp/config.h.in N kuml/kuml_gui/src/editorapp/Makefile.in N kuml/kuml_gui/src/editorapp/configure N kuml/kuml_gui/src/editorapp/subdirs N kuml/kuml_gui/src/editorapp/readme.txt N kuml/kuml_gui/src/editorapp/admin/ChangeLog N kuml/kuml_gui/src/editorapp/admin/Makefile.common N kuml/kuml_gui/src/editorapp/admin/acinclude.m4.in N kuml/kuml_gui/src/editorapp/admin/am_edit N kuml/kuml_gui/src/editorapp/admin/config.guess N kuml/kuml_gui/src/editorapp/admin/config.sub N kuml/kuml_gui/src/editorapp/admin/debianrules N kuml/kuml_gui/src/editorapp/admin/install-sh N kuml/kuml_gui/src/editorapp/admin/libtool.m4.in N kuml/kuml_gui/src/editorapp/admin/ltconfig N kuml/kuml_gui/src/editorapp/admin/ltmain.sh N kuml/kuml_gui/src/editorapp/admin/missing N kuml/kuml_gui/src/editorapp/admin/mkinstalldirs N kuml/kuml_gui/src/editorapp/admin/configure.in.min N kuml/kuml_gui/src/editorapp/admin/depcomp N kuml/kuml_gui/src/editorapp/admin/ltcf-c.sh N kuml/kuml_gui/src/editorapp/admin/ltcf-cxx.sh N kuml/kuml_gui/src/editorapp/admin/config.pl N kuml/kuml_gui/src/editorapp/admin/ylwrap N kuml/kuml_gui/src/editorapp/admin/conf.change.pl N kuml/kuml_gui/src/editorapp/admin/am_edit.py N kuml/kuml_gui/src/editorapp/admin/ltcf-gcj.sh N kuml/kuml_gui/src/editorapp/editorapp/editorappview.h N kuml/kuml_gui/src/editorapp/editorapp/Makefile.am N kuml/kuml_gui/src/editorapp/editorapp/main.cpp N kuml/kuml_gui/src/editorapp/editorapp/filesave.xpm N kuml/kuml_gui/src/editorapp/editorapp/lo32-app-editorapp.png N kuml/kuml_gui/src/editorapp/editorapp/filenew.xpm N kuml/kuml_gui/src/editorapp/editorapp/editorappview.cpp N kuml/kuml_gui/src/editorapp/editorapp/fileopen.xpm N kuml/kuml_gui/src/editorapp/editorapp/editorapp.cpp N kuml/kuml_gui/src/editorapp/editorapp/editorapp.h N kuml/kuml_gui/src/editorapp/editorapp/editorappdoc.cpp N kuml/kuml_gui/src/editorapp/editorapp/editorappdoc.h N kuml/kuml_gui/src/editorapp/editorapp/lo16-app-editorapp.png N kuml/kuml_gui/src/editorapp/editorapp/Makefile.in N kuml/kuml_gui/src/editorapp/editorapp/docs/Makefile.am N kuml/kuml_gui/src/editorapp/editorapp/docs/en/Makefile.am N kuml/kuml_gui/src/editorapp/editorapp/templates/header_template N kuml/kuml_gui/src/editorapp/editorapp/templates/cpp_template No conflicts created by this import ***** Bogus filespec: - ***** Bogus filespec: Imported ***** Bogus filespec: sources |
|
From: Darius S. <dst...@us...> - 2001-07-08 15:54:14
|
Update of /cvsroot/kuml/kuml/kuml_gui/src/editorapp In directory usw-pr-cvs1:/tmp/cvs-serv29532/editorapp Log Message: Directory /cvsroot/kuml/kuml/kuml_gui/src/editorapp added to the repository |
|
From: Darius S. <dst...@us...> - 2001-07-08 12:49:00
|
Update of /cvsroot/kuml/kuml/kuml_gui/src/ige In directory usw-pr-cvs1:/tmp/cvs-serv20559 Modified Files: readme.txt Log Message: Update Index: readme.txt =================================================================== RCS file: /cvsroot/kuml/kuml/kuml_gui/src/ige/readme.txt,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** readme.txt 2001/06/20 19:21:09 1.1.1.1 --- readme.txt 2001/07/08 12:48:57 1.2 *************** *** 2,6 **** -------------------------- ! Last updated on 06.20.2001 You can use the provided makefile to build the sources or create a new one with tmake from TrollTech. --- 2,6 ---- -------------------------- ! Last updated on 2001-07-08 You can use the provided makefile to build the sources or create a new one with tmake from TrollTech. *************** *** 10,12 **** --- 10,24 ---- tmake ige.pro -o Makefile + Remark: + tmake assumes that the environment variable QTDIR is pointing to the root path + of your Qt installation. + If you use Mandrake Linux you may encounter problems with unset environment + variables like QTDIR and KDEDIR. The generated makefile make use of QTDIR and + therefore it must be set in order to compile the sources without errors. + + I've written a small script workaround that sets this variable and starts the + make process. You may use it if you share my problem. + + + Darius Stachow <sta...@in...> \ No newline at end of file |
|
From: Darius S. <dst...@us...> - 2001-07-08 12:26:51
|
Update of /cvsroot/kuml/kuml/kuml_gui/src/ige In directory usw-pr-cvs1:/tmp/cvs-serv15170 Added Files: mand.sh Log Message: Added file --- NEW FILE --- # This is a workaround for Mandrake linux where some # environment variables aren't set. One of the needed variables # is QTDIR. It will be used in the generated makefile (tmake). # # This file will become obsolete as soon as I'll find out why mandrake # don't execute the user profile scripts when I login using X11 instead of the # console. The file ".bash_profile" in the home directory contains the # export statements to declare variables, but they aren't set though they # should. export QTDIR=/usr/lib/qt2 make -f Makefile |
|
From: Gerard F. <ger...@us...> - 2001-07-02 21:26:26
|
Update of /cvsroot/kuml/kuml/libkuml/mof
In directory usw-pr-cvs1:/tmp/cvs-serv9084
Modified Files:
BUILD ChangeLog Generic.cpp Generic.hh Makefile
MofIdlReverseMapper.cpp Reflective_impl.cc RepoManager.cpp
RepoManager.hh notes.txt
Added Files:
MetaModelManager.cpp MetaModelManager.hh
Log Message:
2001-7-2 Gerard Flynn <ger...@fr...>
* Added MetaModelManager class
* Added createMetaModel and fillInMetaModel virtual methods to
GenericBaseObject, meta model creation is now driven from the
package level on down
* Rearranged RepoManager buildImplementation code
* Added handling of References to InterfaceReverseMapper (we assume
anything with a type of tk_objref is a Reference)
* Added meta object creation for Packages
VS: Committing in .
VS:
VS: Modified Files:
VS: BUILD ChangeLog Generic.cpp Generic.hh Makefile
VS: MofIdlReverseMapper.cpp Reflective_impl.cc RepoManager.cpp
VS: RepoManager.hh notes.txt
VS: Added Files:
VS: MetaModelManager.cpp MetaModelManager.hh
VS: ----------------------------------------------------------------------
***** Error reading new file: [Errno 2] No such file or directory: 'MetaModelManager.cpp'
***** Error reading new file: [Errno 2] No such file or directory: 'MetaModelManager.hh'
Index: BUILD
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/mof/BUILD,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** BUILD 2001/06/30 07:31:26 1.2
--- BUILD 2001/07/02 21:26:22 1.3
***************
*** 27,34 ****
This will produce a very large number of debugging messages as the MOF IDL
! is parsed and the implementation classes created.
!
! Currently the program will die with an error message which occurs when
! meta objects are created for each of the MOF classes. This is due to a mismatch
! between the Reflective create_instance operation arguments and the way in which
! attributes are stored by the Generic classes.
--- 27,29 ----
This will produce a very large number of debugging messages as the MOF IDL
! is parsed and the implementation classes created.
\ No newline at end of file
Index: ChangeLog
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/mof/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ChangeLog 2001/06/30 07:31:26 1.2
--- ChangeLog 2001/07/02 21:26:22 1.3
***************
*** 19,21 ****
* Corrected Mico prerequisite in BUILD file, >= 2.3.5 required
* Renamed RegularExpression.hh and .cpp to KumlUtilities
! * Began work on mCorba::showTC function for TypeCode display
\ No newline at end of file
--- 19,31 ----
* Corrected Mico prerequisite in BUILD file, >= 2.3.5 required
* Renamed RegularExpression.hh and .cpp to KumlUtilities
! * Began work on mCorba::showTC function for TypeCode display
!
! 2001-7-2 Gerard Flynn <ger...@fr...>
! * Added MetaModelManager class
! * Added createMetaModel and fillInMetaModel virtual methods to
! GenericBaseObject, meta model creation is now driven from the
! package level on down
! * Rearranged RepoManager buildImplementation code
! * Added handling of References to InterfaceReverseMapper (we assume
! anything with a type of tk_objref is a Reference)
! * Added meta object creation for Packages
\ No newline at end of file
Index: Generic.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/mof/Generic.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Generic.cpp 2001/06/30 07:31:26 1.2
--- Generic.cpp 2001/07/02 21:26:22 1.3
***************
*** 33,36 ****
--- 33,37 ----
#include "mCorba.hh"
+ #include "MetaModelManager.hh"
GenericBaseObject::GenericBaseObject( const string& name,
***************
*** 49,52 ****
--- 50,62 ----
}
+ void GenericBaseObject::createMetaModel( MetaModelManager* metaModelMgr )
+ {
+ // We create an anonymous instance which will be filled in later.
+ p_meta_object = metaModelMgr->getClass_ClassProxy()->create_instance( string("") );
+ }
+
+ void GenericBaseObject::fillInMetaModel()
+ {}
+
void GenericBaseObject::createMetaObject( GenericClassProxy* meta_class )
{
***************
*** 108,111 ****
--- 118,140 ----
{}
+ void GenericPackage::createMetaModel( MetaModelManager* metaModelMgr )
+ {
+ createMetaObject( metaModelMgr->getPackage_ClassProxy() );
+ for( classVect::iterator p = m_classProxies.begin();
+ p != m_classProxies.end(); ++p )
+ {
+ (*p)->createMetaModel( metaModelMgr );
+ }
+ }
+
+ void GenericPackage::fillInMetaModel()
+ {
+ for( classVect::iterator p = m_classProxies.begin();
+ p != m_classProxies.end(); ++p )
+ {
+ (*p)->fillInMetaModel();
+ }
+ }
+
void GenericPackage::makeDesignatorMaps()
{
***************
*** 565,570 ****
{}
! void GenericClassProxy::fillInMetaObject()
{
/*
meta_class should be the meta_class object for ModelElement::Class
--- 594,609 ----
{}
! void GenericClassProxy::createMetaModel( MetaModelManager* metaModelMgr )
{
+ createMetaObject( metaModelMgr->getClass_ClassProxy() );
+ for( featureVect::const_iterator q = m_instanceLevelFeatures.begin();
+ q != m_instanceLevelFeatures.end(); ++q )
+ {
+ (*q)->feature->createMetaModel( metaModelMgr );
+ }
+ }
+
+ void GenericClassProxy::fillInMetaModel()
+ {
/*
meta_class should be the meta_class object for ModelElement::Class
***************
*** 583,587 ****
*/
! cerr << "Start of fillInMetaObject" << endl;
Reflective::ValueTypeList args;
--- 622,626 ----
*/
! cerr << "Start of GenericClassProxy::fillInMetaModel" << endl;
Reflective::ValueTypeList args;
***************
*** 689,693 ****
cerr << "Before call to fillInInstance" << endl;
p_meta_object->fillInInstance( args );
! cerr << "End of call to fillInMetaObject" << endl;
}
--- 728,732 ----
cerr << "Before call to fillInInstance" << endl;
p_meta_object->fillInInstance( args );
! cerr << "End of call to GenericClassProxy::fillInMetaModel" << endl;
}
***************
*** 1133,1136 ****
--- 1172,1180 ----
{}
+ void GenericAttribute::createMetaModel( MetaModelManager* metaModelMgr )
+ {
+ createMetaObject( metaModelMgr->getMofAttribute_ClassProxy() );
+ }
+
GenericValue::GenericValue( GenericStructuralFeature* feature )
:p_feature(feature)
***************
*** 1410,1413 ****
--- 1454,1463 ----
{}
+ void GenericReference::createMetaModel( MetaModelManager* metaModelMgr )
+ {
+ createMetaObject( metaModelMgr->getReference_ClassProxy() );
+ }
+
+
GenericOperation::GenericOperation( const string& name,
scopeKind scope,
***************
*** 1415,1416 ****
--- 1465,1471 ----
:GenericFeature(name,OPERATION,scope,meta_object)
{}
+
+ void GenericOperation::createMetaModel( MetaModelManager* metaModelMgr )
+ {
+ createMetaObject( metaModelMgr->getOperation_ClassProxy() );
+ }
Index: Generic.hh
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/mof/Generic.hh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Generic.hh 2001/06/30 07:31:26 1.2
--- Generic.hh 2001/07/02 21:26:22 1.3
***************
*** 70,73 ****
--- 70,75 ----
#include "Reflective_impl.h"
+ class MetaModelManager;
+
// Generic implementation classes for the five types of MOF meta-objects.
class GenericBaseObject;
***************
*** 110,113 ****
--- 112,119 ----
virtual ~GenericBaseObject() {}
+ virtual void createMetaModel( MetaModelManager* metaModelMgr );
+
+ virtual void fillInMetaModel();
+
/// Creates an empty instance object with only a mof_id.
virtual void createMetaObject( GenericClassProxy* meta_class );
***************
*** 162,166 ****
public: // Instanciation.
GenericPackage( const string& name,
! GenericInstance* meta_object = 0 );
virtual ~GenericPackage() {}
--- 168,172 ----
public: // Instanciation.
GenericPackage( const string& name,
! GenericInstance* meta_object = 0 );
virtual ~GenericPackage() {}
***************
*** 177,180 ****
--- 183,190 ----
void makeDesignatorMaps();
+
+ virtual void createMetaModel( MetaModelManager* metaModelMgr );
+
+ virtual void fillInMetaModel();
public: // Non-MOF accessors.
GenericClassProxy* classProxy( const string& name );
***************
*** 353,356 ****
--- 363,370 ----
virtual ~GenericClassProxy() {}
+ virtual void createMetaModel( MetaModelManager* metaModelMgr );
+
+ virtual void fillInMetaModel();
+
void createAttributeMetaObjects( GenericClassProxy* meta_class );
***************
*** 708,711 ****
--- 722,727 ----
virtual ~GenericAttribute() {}
+ virtual void createMetaModel( MetaModelManager* metaModelMgr );
+
private:
bool m_isDerived;
***************
*** 723,726 ****
--- 739,744 ----
virtual ~GenericReference() {}
+
+ virtual void createMetaModel( MetaModelManager* metaModelMgr );
};
***************
*** 734,737 ****
--- 752,757 ----
virtual ~GenericOperation() {}
+
+ virtual void createMetaModel( MetaModelManager* metaModelMgr );
};
Index: Makefile
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/mof/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile 2001/06/30 07:31:26 1.2
--- Makefile 2001/07/02 21:26:22 1.3
***************
*** 12,18 ****
Generic.t : Generic.t.o Generic.o Reflective.o Reflective_impl.o GenericTest.o GenericTest.h \
! mCorba.o
g++ -o Generic.t Generic.t.o Generic.o Reflective_impl.o Reflective.o GenericTest.o \
! mCorba.o ${LIBS}
Generic.t.cpp : GenericTest.h Generic.hh Reflective_impl.h
--- 12,18 ----
Generic.t : Generic.t.o Generic.o Reflective.o Reflective_impl.o GenericTest.o GenericTest.h \
! mCorba.o MetaModelManager.o
g++ -o Generic.t Generic.t.o Generic.o Reflective_impl.o Reflective.o GenericTest.o \
! mCorba.o MetaModelManager.o ${LIBS}
Generic.t.cpp : GenericTest.h Generic.hh Reflective_impl.h
***************
*** 23,31 ****
Autotest.t : Autotest.t.o Autogen.o InterfaceGen.o parsenode.o prepro.o scanner.o \
parser.o treewalker.o Reflective.o Reflective_impl.o Generic.o mCorba.o \
! yacc.o
g++ -o $@ $^ ${LIBS}
MofIdlMapping_t_OBJECTS = MofIdlInterfaces.o MofIdlReverseMapper.o MofIdlMapping.t.o \
! Generic.o Reflective_impl.o Reflective.o mCorba.o KumlUtilities.o \
Autogen.o parsenode.o prepro.o scanner.o parser.o treewalker.o yacc.o
--- 23,31 ----
Autotest.t : Autotest.t.o Autogen.o InterfaceGen.o parsenode.o prepro.o scanner.o \
parser.o treewalker.o Reflective.o Reflective_impl.o Generic.o mCorba.o \
! yacc.o MetaModelManager.o
g++ -o $@ $^ ${LIBS}
MofIdlMapping_t_OBJECTS = MofIdlInterfaces.o MofIdlReverseMapper.o MofIdlMapping.t.o \
! Generic.o Reflective_impl.o Reflective.o mCorba.o KumlUtilities.o MetaModelManager.o \
Autogen.o parsenode.o prepro.o scanner.o parser.o treewalker.o yacc.o
***************
*** 35,40 ****
RepoManager_t_OBJECTS = RepoManager.t.o RepoManager.o MofIdlInterfaces.o \
MofIdlReverseMapper.o Generic.o Reflective_impl.o Reflective.o mCorba.o \
! KumlUtilities.o Autogen.o parsenode.o prepro.o scanner.o \
! parser.o treewalker.o yacc.o
RepoManager.t : ${RepoManager_t_OBJECTS}
--- 35,40 ----
RepoManager_t_OBJECTS = RepoManager.t.o RepoManager.o MofIdlInterfaces.o \
MofIdlReverseMapper.o Generic.o Reflective_impl.o Reflective.o mCorba.o \
! KumlUtilities.o MetaModelManager.o Autogen.o parsenode.o prepro.o scanner.o \
! parser.o treewalker.o yacc.o
RepoManager.t : ${RepoManager_t_OBJECTS}
Index: MofIdlReverseMapper.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/mof/MofIdlReverseMapper.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** MofIdlReverseMapper.cpp 2001/06/30 07:31:26 1.2
--- MofIdlReverseMapper.cpp 2001/07/02 21:26:22 1.3
***************
*** 429,437 ****
cerr << "Adding attribute : " << attr->name << endl;
cerr << "Before call to createTypeCode (base)" << endl;
- if( attr->base_type->getKind() == CORBA::tk_objref ) {
- // If Type is an interface we assume we're dealing with a Reference
- // and not an Attribute. (Temporary hack 2001-6-25).
- continue;
- }
const CORBA::TypeCode* base_tc = attr->base_type->createTypeCode();
cerr << "After call to createTypeCode (base)" << endl;
--- 429,432 ----
***************
*** 460,475 ****
cerr << "Before Attribute instanciation" << endl;
! GenericAttribute* g_attr =
! new GenericAttribute( attr->name,
! base_tc,
! INSTANCE_LEVEL,
! attr->isChangeable,
! false, // isDerived
! *mult_ptr,
! collection_tc );
! cerr << "After Attribute instanciation" << endl;
! class_proxy->addAttribute( g_attr );
cerr << "After addAttribute" << endl;
--- 455,488 ----
cerr << "Before Attribute instanciation" << endl;
! if( attr->base_type->getKind() == CORBA::tk_objref ) {
! // If Type is an interface we assume we're dealing with a Reference
! // and not an Attribute. This may not always be correct but its
! // about the best we can do with IDL.
! GenericReference* g_ref =
! new GenericReference( attr->name,
! base_tc,
! INSTANCE_LEVEL,
! attr->isChangeable,
! *mult_ptr,
! collection_tc );
! cerr << "After Attribute instanciation" << endl;
! class_proxy->addReference( g_ref );
! }
! else { // Attribute.
! GenericAttribute* g_attr =
! new GenericAttribute( attr->name,
! base_tc,
! INSTANCE_LEVEL,
! attr->isChangeable,
! false, // isDerived
! *mult_ptr,
! collection_tc );
!
! cerr << "After Attribute instanciation" << endl;
!
! class_proxy->addAttribute( g_attr );
! }
cerr << "After addAttribute" << endl;
Index: Reflective_impl.cc
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/mof/Reflective_impl.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Reflective_impl.cc 2001/06/22 03:42:03 1.1
--- Reflective_impl.cc 2001/07/02 21:26:22 1.2
***************
*** 24,28 ****
/* ****************************************************************************/
! /* $Header$ */
--- 24,28 ----
/* ****************************************************************************/
! /* $Header$ */
Index: RepoManager.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/mof/RepoManager.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** RepoManager.cpp 2001/06/30 07:31:26 1.2
--- RepoManager.cpp 2001/07/02 21:26:22 1.3
***************
*** 36,40 ****
RepoManager::RepoManager( stageType stage )
:m_stage(stage),
! p_inputFile(0)
{}
--- 36,41 ----
RepoManager::RepoManager( stageType stage )
:m_stage(stage),
! p_inputFile(0),
! p_metaModelMgr(0)
{}
***************
*** 55,119 ****
exit( -1 );
}
!
! interfaceSet interfs = p_agen->getInterfaces();
! for( int i = 0; i < interfs.size(); i++ ) {
! cout << "interface name : " << interfs[i]->getName() << endl;
! }
!
! cout << "\n\n";
!
moduleSet modules = p_agen->getModules();
! GenericPackage* mof_model_package;
! int modelIndex;
! for( int i = 0; i < modules.size(); i++ ) {
cout << "module name : " << modules[i]->getName() << endl;
! if( modules[i]->getName() == "Model" ) { // Process the MOF Model module.
! modelIndex = i;
! ModuleReverseMapper mod_mapper( modules[i] );
! mof_model_package = mod_mapper.createPackage();
! break;
}
}
! // Retrieve the GenericClassProxy for Model::Class.
! GenericClassProxy* MofClass = mof_model_package->classProxy( "Class" );
! GenericClassProxy* MofAttribute = mof_model_package->classProxy( "MofAttribute" );
! assert( MofClass );
! assert( MofAttribute );
!
! cerr << "MofClass attributes : " << endl;
! stringVect class_attr_names = MofClass->instanceLevelAttributeNames();
! for( stringVect::const_iterator p = class_attr_names.begin();
! p != class_attr_names.end();
! ++p )
{
! cerr << " " << *p << endl;
}
- // exit( 0 );
- classVect classProxies = mof_model_package->allClassProxies();
- // Create meta objects for all class proxy's so that we have valid MOF ID's
- for( classVect::iterator p = classProxies.begin();
- p != classProxies.end(); ++p )
- {
- (*p)->createMetaObject( MofClass );
- (*p)->createAttributeMetaObjects( MofAttribute );
- }
! cerr << "RepoManager::buildImplementation, before fillIn" << endl;
! // Now fill in all of the meta object attributes (possible because we now have
! // valid MOF ID's).
! try {
! for( classVect::iterator p = classProxies.begin();
! p != classProxies.end(); ++p )
! {
! (*p)->fillInMetaObject();
! }
! }
! catch( GenericException& e ) {
! cerr << "An Exception occurred in RepoManager::buildImplementation" << endl;
! cerr << e.what() << endl;
! exit( -1 );
! }
}
--- 56,98 ----
exit( -1 );
}
!
moduleSet modules = p_agen->getModules();
! // Create packages for all modules (except Reflective).
! for( int i = 0; i < modules.size(); i++ ) {
cout << "module name : " << modules[i]->getName() << endl;
! if( modules[i]->getName() != "Reflective" ) {
! ModuleReverseMapper mod_mapper( modules[i] );
! m_packages.push_back( mod_mapper.createPackage() );
! if( modules[i]->getName() == "Model" ) {
! p_modelPackage = m_packages.back();
! }
}
}
!
! buildMetaModel();
! }
!
! void RepoManager::buildMetaModel()
! {
! cerr << "Start RepoManager::buildMetaModel" << endl;
!
! p_metaModelMgr = new MetaModelManager( p_modelPackage );
!
! // First call createMetaModel for each Package.
! for( packageVect::iterator p = m_packages.begin();
! p != m_packages.end(); ++p )
{
! (*p)->createMetaModel( p_metaModelMgr );
}
! // Next call fillInMetaModel for each Package.
! for( packageVect::iterator p = m_packages.begin();
! p != m_packages.end(); ++p )
! {
! (*p)->fillInMetaModel();
! }
! cerr << "End RepoManager::buildMetaModel" << endl;
}
Index: RepoManager.hh
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/mof/RepoManager.hh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** RepoManager.hh 2001/06/30 07:31:26 1.2
--- RepoManager.hh 2001/07/02 21:26:22 1.3
***************
*** 29,33 ****
--- 29,35 ----
#define RepoManager_H_IS_INCLUDED
#include <cstdio>
+ #include <vector>
#include "Autogen.hh"
+ #include "MetaModelManager.hh"
enum stageType {
***************
*** 42,45 ****
--- 44,49 ----
class RepoManager
{
+ public: // Types.
+ typedef vector<GenericPackage*> packageVect;
public:
RepoManager( stageType stage = STAGE_1 );
***************
*** 51,54 ****
--- 55,60 ----
void activateRepository();
private:
+ void buildMetaModel();
+ private:
stageType m_stage;
***************
*** 56,59 ****
--- 62,71 ----
MofIdlMapping::Autogen* p_agen;
+
+ MetaModelManager* p_metaModelMgr;
+
+ packageVect m_packages;
+
+ GenericPackage* p_modelPackage;
};
Index: notes.txt
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/mof/notes.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** notes.txt 2001/06/30 07:31:26 1.2
--- notes.txt 2001/07/02 21:26:22 1.3
***************
*** 60,64 ****
6) instanciate Refective servants
! 7) the stage1 imlementation is complete
2001-5-7
--- 60,64 ----
6) instanciate Refective servants
! 7) the stage1 implementation is complete
2001-5-7
***************
*** 132,133 ****
--- 132,181 ----
before annotation in Class).
+ 2001-7-1
+
+ The problems in buildImplementation have now been corrected.
+
+ Now we must construct the user visible Corba objects.
+
+ Since our stage 1 repository is a MOF repository we want to
+ publish objects for the MOF package. The objects that should thus
+ be instantiated are :
+
+ a RefPackage object for the Model::ModelPackage interface
+
+ Recall that a Package object primarily constitutes a
+ "directory" of the different class proxies and associations contained
+ in the package. In the reflective case, this directory may be
+ interrogated via the the 3 operations : ref_class_ref,
+ ref_association_ref and ref_package_ref. Each of these operations
+ takes a DesignatorType value as argument. The designator is the
+ RefBaseObject which is associated with the partcular entity being
+ looked up in the M2-level model.
+
+ In order therefore for a client to access a RefPackage, it must
+ first obtain the meta_object which describes the package. This
+ meta_object will be a RefObject which is an instance of
+ Model::Package. This inherits from GeneralizableElement which in turn
+ inherits from Namespace. Therefore the client can invoke the
+ contents() operation on this object to obtain a list of all the
+ ModelElement's which it contains. It could also invoke the
+ lookupElement operation to search by name or the findElementsByType
+ operation.
+
+ At this point its clear that some tweaking of the automatic
+ implementation process will be necessary because there's no way for
+ the MofIdlReverseMapper to know that the contents reference of Package
+ is supposed to send back the list of contained ModelElements. We
+ should probably start thinking about a general framework for extending
+ the automatic implementation "by hand".
+
+ One question is where to incorporate the creation of base
+ associations since this information isn't contained in IDL. It would
+ seem logical to extend the createMetaObject methods of the Generic
+ objects to handle this since these objects are aware of the principal
+ relationships and these methods are always MOF specific anyway. In
+ other words the createMetaObject for a GenericPackage should add
+ links to the Contains association between itself and the Class Proxies
+ and Associations it contains. This may require a more general method
+ for passing in the meta-model than simply passing a GenericClassProxy
+ object.
\ No newline at end of file
|
