reds-cvs Mailing List for rapidEDS, Rapid Electronic Design System
Status: Alpha
Brought to you by:
rickyw
You can subscribe to this list here.
2005 |
Jan
|
Feb
|
Mar
|
Apr
(33) |
May
|
Jun
(1) |
Jul
(123) |
Aug
(18) |
Sep
(4) |
Oct
|
Nov
|
Dec
|
---|---|---|---|---|---|---|---|---|---|---|---|---|
2006 |
Jan
(9) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
(34) |
Sep
|
Oct
|
Nov
|
Dec
|
From: Ricky W. <ri...@us...> - 2006-08-26 14:53:09
|
Update of /cvsroot/reds/rapideds/src/cadlib/core In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2768/src/cadlib/core Modified Files: Makefile.am Log Message: change libcorexml over to be a libtool library Index: Makefile.am =================================================================== RCS file: /cvsroot/reds/rapideds/src/cadlib/core/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.am 26 Aug 2006 13:21:29 -0000 1.3 --- Makefile.am 26 Aug 2006 14:53:05 -0000 1.4 *************** *** 15,18 **** libcadlib_core_la_LIBADD = $(top_builddir)/src/common/librapideds-common.la \ ! $(LIB_KDECORE) $(LIB_KDEUI) SUBDIRS = XML --- 15,18 ---- libcadlib_core_la_LIBADD = $(top_builddir)/src/common/librapideds-common.la \ ! $(top_builddir)/src/cadlib/core/XML/libcorexml.la $(LIB_KDECORE) $(LIB_KDEUI) SUBDIRS = XML |
From: Ricky W. <ri...@us...> - 2006-08-26 14:53:09
|
Update of /cvsroot/reds/rapideds/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2768/src Modified Files: Makefile.am Log Message: change libcorexml over to be a libtool library Index: Makefile.am =================================================================== RCS file: /cvsroot/reds/rapideds/src/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile.am 26 Aug 2006 13:21:29 -0000 1.7 --- Makefile.am 26 Aug 2006 14:53:05 -0000 1.8 *************** *** 27,33 **** rapideds_LDFLAGS = $(KDE_RPATH) $(all_libraries) rapideds_LDADD = $(top_builddir)/src/common/librapideds-common.la \ ! $(top_builddir)/src/cadlib/core/libcadlib-core.la $(top_builddir)/src/cadlib/core/XML/libcorexml.a \ ! $(top_builddir)/src/schedit/libschedit_part.la $(top_builddir)/sqlite/libsqlite.la \ ! $(top_builddir)/src/pcbedit/libpcbedit.la -lkmdi $(LIB_KPARTS) # this is where the desktop file will go --- 27,32 ---- rapideds_LDFLAGS = $(KDE_RPATH) $(all_libraries) rapideds_LDADD = $(top_builddir)/src/common/librapideds-common.la \ ! $(top_builddir)/src/cadlib/core/libcadlib-core.la $(top_builddir)/src/schedit/libschedit_part.la \ ! $(top_builddir)/sqlite/libsqlite.la $(top_builddir)/src/pcbedit/libpcbedit.la -lkmdi $(LIB_KPARTS) # this is where the desktop file will go |
From: Ricky W. <ri...@us...> - 2006-08-26 14:53:09
|
Update of /cvsroot/reds/rapideds/src/cadlib/tools/browse In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2768/src/cadlib/tools/browse Modified Files: Makefile.am Log Message: change libcorexml over to be a libtool library Index: Makefile.am =================================================================== RCS file: /cvsroot/reds/rapideds/src/cadlib/tools/browse/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 26 Aug 2006 14:15:41 -0000 1.1 --- Makefile.am 26 Aug 2006 14:53:06 -0000 1.2 *************** *** 5,8 **** browselib_SOURCES = browselibdlg.cpp browselib-main.cpp browselib_LDADD = $(top_builddir)/src/ui/cadlib/libui-cadlib.la \ ! $(top_builddir)/src/cadlib/gui/libgui.la $(top_builddir)/src/cadlib/core/libcadlib-core.la \ ! $(top_builddir)/src/cadlib/core/XML/libcorexml.a --- 5,7 ---- browselib_SOURCES = browselibdlg.cpp browselib-main.cpp browselib_LDADD = $(top_builddir)/src/ui/cadlib/libui-cadlib.la \ ! $(top_builddir)/src/cadlib/gui/libgui.la $(top_builddir)/src/cadlib/core/libcadlib-core.la |
From: Ricky W. <ri...@us...> - 2006-08-26 14:53:09
|
Update of /cvsroot/reds/rapideds/src/cadlib/tools In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2768/src/cadlib/tools Modified Files: Makefile.am Log Message: change libcorexml over to be a libtool library Index: Makefile.am =================================================================== RCS file: /cvsroot/reds/rapideds/src/cadlib/tools/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.am 26 Aug 2006 14:15:41 -0000 1.3 --- Makefile.am 26 Aug 2006 14:53:05 -0000 1.4 *************** *** 10,24 **** lslib_LDADD = $(top_builddir)/src/common/librapideds-common.la \ ! $(top_builddir)/src/cadlib/core/libcadlib-core.la $(top_builddir)/src/cadlib/core/XML/libcorexml.a $(LIB_KDECORE) \ ! $(LIB_KDEUI) dumpobj_LDADD = $(top_builddir)/src/common/librapideds-common.la \ ! $(top_builddir)/src/cadlib/core/libcadlib-core.la $(top_builddir)/src/cadlib/core/XML/libcorexml.a $(LIB_KDECORE) \ ! $(LIB_KDEUI) rmlib_LDADD = $(top_builddir)/src/common/librapideds-common.la \ ! $(top_builddir)/src/cadlib/core/libcadlib-core.la $(top_builddir)/src/cadlib/core/XML/libcorexml.a $(LIB_KDECORE) \ ! $(LIB_KDEUI) METASOURCES = AUTO --- 10,21 ---- lslib_LDADD = $(top_builddir)/src/common/librapideds-common.la \ ! $(top_builddir)/src/cadlib/core/libcadlib-core.la $(LIB_KDECORE) $(LIB_KDEUI) dumpobj_LDADD = $(top_builddir)/src/common/librapideds-common.la \ ! $(top_builddir)/src/cadlib/core/libcadlib-core.la $(LIB_KDECORE) $(LIB_KDEUI) rmlib_LDADD = $(top_builddir)/src/common/librapideds-common.la \ ! $(top_builddir)/src/cadlib/core/libcadlib-core.la $(LIB_KDECORE) $(LIB_KDEUI) METASOURCES = AUTO |
From: Ricky W. <ri...@us...> - 2006-08-26 14:53:09
|
Update of /cvsroot/reds/rapideds/src/cadlib/core/XML In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2768/src/cadlib/core/XML Modified Files: Makefile.am indexxml.cpp Log Message: change libcorexml over to be a libtool library Index: Makefile.am =================================================================== RCS file: /cvsroot/reds/rapideds/src/cadlib/core/XML/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.am 26 Aug 2006 13:21:29 -0000 1.2 --- Makefile.am 26 Aug 2006 14:53:05 -0000 1.3 *************** *** 2,9 **** METASOURCES = AUTO - lib_LIBRARIES = libcorexml.a - libcorexml_a_SOURCES = indexxml.cpp loadpartXML.cpp \ - loadpinstylexml.cpp loadsymXML.cpp locallib.cpp prjlibcache.cpp loadfootprintXML.cpp noinst_HEADERS = indexxml.h loadpartXML.h loadpinstylexml.h loadsymXML.h\ locallib.h prjlibcache.h --- 2,6 ---- *************** *** 14,15 **** --- 11,16 ---- ##libcadlibcorexml_la_SOURCES = indexxml.cpp loadpartXML.cpp \ ## loadpinstylexml.cpp loadsymXML.cpp locallib.cpp prjlibcache.cpp loadfootprintXML.cpp + lib_LTLIBRARIES = libcorexml.la + libcorexml_la_LDFLAGS = $(all_libraries) + libcorexml_la_SOURCES = indexxml.cpp loadfootprintXML.cpp loadpartXML.cpp\ + loadpinstylexml.cpp loadsymXML.cpp locallib.cpp prjlibcache.cpp Index: indexxml.cpp =================================================================== RCS file: /cvsroot/reds/rapideds/src/cadlib/core/XML/indexxml.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** indexxml.cpp 21 Jul 2005 16:39:19 -0000 1.3 --- indexxml.cpp 26 Aug 2006 14:53:05 -0000 1.4 *************** *** 36,40 **** IndexXML::~IndexXML() ! { } --- 36,40 ---- IndexXML::~IndexXML() ! { } |
From: Ricky W. <ri...@us...> - 2006-08-26 14:53:09
|
Update of /cvsroot/reds/rapideds/src/cadlib/tools/XML In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2768/src/cadlib/tools/XML Modified Files: Makefile.am Log Message: change libcorexml over to be a libtool library Index: Makefile.am =================================================================== RCS file: /cvsroot/reds/rapideds/src/cadlib/tools/XML/Makefile.am,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile.am 12 Dec 2004 11:25:13 -0000 1.1.1.1 --- Makefile.am 26 Aug 2006 14:53:05 -0000 1.2 *************** *** 5,8 **** indexlocallib_SOURCES = indexlocallib.cpp indexlocallib_LDADD = $(top_builddir)/src/common/librapideds-common.la \ ! $(top_builddir)/src/cadlib/core/libcadlib-core.la $(top_builddir)/src/cadlib/core/XML/libcorexml.a $(LIB_KDECORE) --- 5,8 ---- indexlocallib_SOURCES = indexlocallib.cpp indexlocallib_LDADD = $(top_builddir)/src/common/librapideds-common.la \ ! $(top_builddir)/src/cadlib/core/libcadlib-core.la $(LIB_KDECORE) |
From: Ricky W. <ri...@us...> - 2006-08-26 14:53:09
|
Update of /cvsroot/reds/rapideds/src/common In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2768/src/common Modified Files: Makefile.am Log Message: change libcorexml over to be a libtool library Index: Makefile.am =================================================================== RCS file: /cvsroot/reds/rapideds/src/common/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile.am 15 Jul 2005 15:21:48 -0000 1.8 --- Makefile.am 26 Aug 2006 14:53:06 -0000 1.9 *************** *** 19,24 **** test_netlist_SOURCES = test_netlist.cpp test_netlist_LDADD = $(top_builddir)/sqlite/libsqlite.la \ ! $(top_builddir)/src/cadlib/core/libcadlib-core.la $(top_builddir)/src/cadlib/core/XML/libcorexml.a \ ! $(top_builddir)/src/common/librapideds-common.la $(LIB_KDEUI) $(LIB_KDECORE) check_designatormgr_LDFLAGS = $(all_libraries) --- 19,24 ---- test_netlist_SOURCES = test_netlist.cpp test_netlist_LDADD = $(top_builddir)/sqlite/libsqlite.la \ ! $(top_builddir)/src/cadlib/core/libcadlib-core.la $(top_builddir)/src/common/librapideds-common.la $(LIB_KDEUI) \ ! $(LIB_KDECORE) check_designatormgr_LDFLAGS = $(all_libraries) *************** *** 26,29 **** check_designatormgr_LDADD = $(top_builddir)/sqlite/libsqlite.la \ $(top_builddir)/src/common/librapideds-common.la $(top_builddir)/src/cadlib/core/libcadlib-core.la \ ! $(top_builddir)/src/ui/cadlib/libui-cadlib.la $(top_builddir)/src/cadlib/core/XML/libcorexml.a $(LIB_KDEUI) \ ! $(LIB_KDECORE) --- 26,28 ---- check_designatormgr_LDADD = $(top_builddir)/sqlite/libsqlite.la \ $(top_builddir)/src/common/librapideds-common.la $(top_builddir)/src/cadlib/core/libcadlib-core.la \ ! $(top_builddir)/src/ui/cadlib/libui-cadlib.la $(LIB_KDEUI) $(LIB_KDECORE) |
From: Ricky W. <ri...@us...> - 2006-08-26 14:15:45
|
Update of /cvsroot/reds/rapideds/src/cadlib/tools In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20860 Modified Files: Makefile.am Removed Files: browselib-main.cpp browselibdlg.cpp browselibdlg.h Log Message: move browse to a separate directory to resolve build issues --- browselibdlg.h DELETED --- Index: Makefile.am =================================================================== RCS file: /cvsroot/reds/rapideds/src/cadlib/tools/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.am 26 Aug 2006 13:21:30 -0000 1.2 --- Makefile.am 26 Aug 2006 14:15:41 -0000 1.3 *************** *** 1,7 **** INCLUDES = -I$(top_srcdir)/src/cadlib/core -I$(top_srcdir)/src/cadlib/gui \ -I$(top_srcdir)/src/common -I$(top_srcdir)/src/ui/cadlib $(all_includes) ! ##METASOURCES = AUTO ! SUBDIRS = XML ! bin_PROGRAMS = libbrowse rmlib lslib dumpobj rmlib_SOURCES = rmlib.cpp --- 1,7 ---- INCLUDES = -I$(top_srcdir)/src/cadlib/core -I$(top_srcdir)/src/cadlib/gui \ -I$(top_srcdir)/src/common -I$(top_srcdir)/src/ui/cadlib $(all_includes) ! ! SUBDIRS = XML browse ! bin_PROGRAMS = rmlib lslib dumpobj rmlib_SOURCES = rmlib.cpp *************** *** 22,30 **** $(LIB_KDEUI) ! ! libbrowse_SOURCES = browselibdlg.cpp browselib-main.cpp ! libbrowse_LDADD = $(top_builddir)/src/cadlib/core/libcadlib-core.la \ ! $(top_builddir)/src/ui/cadlib/libui-cadlib.la $(top_builddir)/src/cadlib/gui/libgui.la \ ! $(top_builddir)/src/cadlib/core/XML/libcorexml.a $(LIB_KDEUI) ! libbrowse_LDFLAGS = $(KDE_RPATH) $(all_libraries) --- 22,25 ---- $(LIB_KDEUI) ! METASOURCES = AUTO --- browselib-main.cpp DELETED --- --- browselibdlg.cpp DELETED --- |
From: Ricky W. <ri...@us...> - 2006-08-26 14:15:45
|
Update of /cvsroot/reds/rapideds/src/cadlib/tools/browse In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20860/browse Added Files: Makefile.am browselib-main.cpp browselibdlg.cpp browselibdlg.h Log Message: move browse to a separate directory to resolve build issues --- NEW FILE: browselibdlg.h --- // file : .h // Descr : // Author : Ricky White ( ri...@ne... ) // License : GNU GPL General Public License // Copyright : Copyright (C) Ricky White 2004 /////////////////////////////////////////////////////////////////////////////// #ifndef BROWSELIBDLG_H #define BROWSELIBDLG_H #include "browse_lib_form.h" /** @author Ricky White <ri...@ne...> */ class BrowseLibDlg : public BrowseLibForm { Q_OBJECT; public: BrowseLibDlg( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); virtual ~BrowseLibDlg() {} //public slots: void setCurName( QString name ); void setCurDescr( QString descr ); void setCurPath( QString path ); }; #endif --- NEW FILE: Makefile.am --- INCLUDES = -I$(top_srcdir)/src/cadlib/core -I$(top_srcdir)/src/cadlib/gui -I$(top_srcdir)/src/common -I$(top_srcdir)/src/ui/cadlib $(all_includes) METASOURCES = AUTO bin_PROGRAMS = browselib browselib_SOURCES = browselibdlg.cpp browselib-main.cpp browselib_LDADD = $(top_builddir)/src/ui/cadlib/libui-cadlib.la \ $(top_builddir)/src/cadlib/gui/libgui.la $(top_builddir)/src/cadlib/core/libcadlib-core.la \ $(top_builddir)/src/cadlib/core/XML/libcorexml.a --- NEW FILE: browselib-main.cpp --- // file : browselib-main.cpp // Descr : // Author : Ricky White ( ri...@ne... ) // License : GNU GPL General Public License // Copyright : Copyright (C) Ricky White 2004 /////////////////////////////////////////////////////////////////////////////// //#include "browselib.h" #include <kapplication.h> #include <kaboutdata.h> #include <kcmdlineargs.h> #include <klocale.h> #include "browselibdlg.h" static const char description[] = I18N_NOOP("Rapideds Library browser"); static const char version[] = "0.1"; static KCmdLineOptions options[] = { // { "+[URL]", I18N_NOOP( "Document to open" ), 0 }, KCmdLineLastOption }; int main(int argc, char **argv) { KAboutData about("browselib", I18N_NOOP("rapideds_libbrowse"), version, description, KAboutData::License_GPL, "(C) 2006 Ricky White", 0, 0, "ri...@ne..."); about.addAuthor( "Ricky White", 0, "ric...@ne..." ); KCmdLineArgs::init(argc, argv, &about); KCmdLineArgs::addCmdLineOptions( options ); KApplication app; BrowseLibDlg *mainWin = 0; if (app.isRestored()) { // RESTORE(BrowseLibDlg); } else { // no session.. just start up normally KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); /// @todo do something with the command line args here // mainWin = new BrowseLib(); // app.setMainWidget( mainWin ); // mainWin->show(); mainWin = new BrowseLibDlg(); app.setMainWidget( mainWin ); mainWin->show(); args->clear(); } // mainWin has WDestructiveClose flag by default, so it will delete itself. return app.exec(); } --- NEW FILE: browselibdlg.cpp --- // file : .cpp // Descr : // Author : Ricky White ( ri...@ne... ) // License : GNU GPL General Public License // Copyright : Copyright (C) Ricky White 2004 /////////////////////////////////////////////////////////////////////////////// #include "browselibdlg.h" #include <qtable.h> #include <kcombobox.h> #include <kdebug.h> #include "libobject.h" BrowseLibDlg::BrowseLibDlg( QWidget* parent, const char* name, bool modal, WFlags fl ) : BrowseLibForm( parent, name, modal, fl) { objType_CB->clear(); objType_CB->insertStringList( LibObject::getObjectTypes() ); connect(objType_CB,SIGNAL( activated(const QString &)), tree_LV,SLOT(setObjectType( const QString & ) ) ); connect( tree_LV, SIGNAL( curName(QString) ), SLOT( setCurName(QString) ) ); connect( tree_LV, SIGNAL( curDescr(QString) ), SLOT( setCurDescr(QString) ) ); connect( tree_LV, SIGNAL( curPath(QString) ), SLOT( setCurPath(QString) ) ); } void BrowseLibDlg::setCurName( QString name ) { properties_TB->setText( 0, 0, name ); } void BrowseLibDlg::setCurDescr( QString descr ) { properties_TB->setText( 1, 0, descr ); } void BrowseLibDlg::setCurPath( QString path ) { properties_TB->setText( 3, 0, path ); } //#include "browselibdlg.moc.cpp" |
From: Ricky W. <ri...@us...> - 2006-08-26 14:14:11
|
Update of /cvsroot/reds/rapideds/src/cadlib/tools/browse In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20370/browse Log Message: Directory /cvsroot/reds/rapideds/src/cadlib/tools/browse added to the repository |
From: Ricky W. <ri...@us...> - 2006-08-26 13:22:04
|
Update of /cvsroot/reds/rapideds/src/cadlib/gui In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28791/src/cadlib/gui Modified Files: Makefile.am Added Files: libbrowsetree.cpp libbrowsetree.h Log Message: Initial PCB framework --- NEW FILE: libbrowsetree.cpp --- // file : libbrowsetree.cpp // Descr : // Author : Ricky White ( ri...@ne... ) // License : GNU GPL General Public License // Copyright : Copyright (C) Ricky White 2004 /////////////////////////////////////////////////////////////////////////////// #include <qpixmap.h> #include <qstring.h> #include <kdebug.h> #include "libbrowsetree.h" LibBrowseTree::LibBrowseTree( QWidget *parent, const char *name ) : KListView(parent,name), m_libDB(LibDbMgr::instance()), m_libObjectType(LibObject::PART) { // customise the tree a bit setRootIsDecorated(true); addColumn("Library"); initTree(); m_showPrjCache = false; connect(this,SIGNAL(selectionChanged(QListViewItem*)), this, SLOT(selectionChangedSlot( QListViewItem* ))); } LibBrowseTree::~LibBrowseTree() { } QStringList LibBrowseTree::supportedObjTypes() { return LibObject::getObjectTypes(); } /** Adds a branch to the tree based on a Database source */ void LibBrowseTree::addSource( const QString &source ) { QListViewItem *srcitem, *grpitem, *partitem; QStringList grplst,partlst; srcitem = new QListViewItem(this, source ); // add sub groups grplst = m_libDB->getGroupList(m_libObjectType,source); QStringList::Iterator grpit; for ( grpit=grplst.begin(); grpit!=grplst.end(); ++grpit ) { grpitem = new QListViewItem(srcitem, *grpit ); grpitem->setPixmap(0,m_libDB->getGroupImage(m_libObjectType, source, *grpit )); // Add in parts for that subgroup partlst = m_libDB->getObjList(m_libObjectType,source,*grpit); QStringList::Iterator pit; for( pit=partlst.begin(); pit!=partlst.end(); ++pit) partitem = new QListViewItem(grpitem, *pit ); } } void LibBrowseTree::setSearchQuerySlot(const QString &query) { m_curQuery = query; kdDebug()<<"void LibBrowseTree::setSearchQuerySlot(\""<<query<<"\")"<<endl; } /** The user has requested a search If query is emptu m_curQuery will be used. */ void LibBrowseTree::searchSlot( QString query ) { LibPathList pplst; QListViewItem *s,*g=0,*e; QStringList slist,glist; // holds a list of all groups found if( !query.isEmpty() ) m_curQuery = query; // delete previous search results QListViewItem *c; while( (c=m_searchResultItem->firstChild()) ) delete c; // expand the search branch m_searchResultItem->setOpen(true); // To understand this code: // Remember when LibDbMgr returns a list of partparths // the entries in the list are in order and grouped by source and by groups. QStringList srclst = m_libDB->getSourceNames(); for( QStringList::iterator sit=srclst.begin(); sit != srclst.end(); sit++) { // for each available source kdDebug()<<"source="<<(*sit)<<endl; pplst = m_libDB->find(m_libObjectType,*sit,"*",m_curQuery ); if(pplst.count()!=0) { // Server returned parts so add the server entry s = new QListViewItem(m_searchResultItem,(*sit)); // Add each returned group and all parts under it... QString curgrp; LibPathList::iterator pit; for( pit=pplst.begin(); pit != pplst.end(); pit++) { if(curgrp!=(*pit).getGroup()) { // just changed group curgrp=(*pit).getGroup(); // Add the new group g = new QListViewItem(s,curgrp); g->setPixmap(0,m_libDB->getGroupImage(m_libObjectType,*sit,curgrp)); } // add the part entry e = new QListViewItem(g,(*pit).name()); } } } m_searchResultItem->setOpen(true); } void LibBrowseTree::setLibObjType(LibObject::OTYPE type) { m_libObjectType=type; initTree(); } /** Set the object type by name \param type String name of theobject type to select */ void LibBrowseTree::setObjectType( const QString &type ) { setLibObjType( LibObject::typeFromString(type) ); kdDebug()<<"gfdgdfsgsdfgdfgsdfgsdfG"<<endl; } /** Populate the tree. 1) add static entries 2) fill in data for entire library @FIXME: add a background thread to populate the libray data as it may take a while. If background loading is added add a progress percentage signal. */ void LibBrowseTree::initTree() { clear(); // Populate the top level of the tree control if(m_showPrjCache) m_prjCacheItem = new QListViewItem(this,"Project cache"); m_searchResultItem = new QListViewItem(this,"Search results"); // Add the databases that we have successfully connected to QStringList serverlst = m_libDB->getSourceNames(); QStringList::Iterator it; for( it=serverlst.begin(); it != serverlst.end(); ++it ) addSource( *it ); } /** User has selected a different item in the tree */ void LibBrowseTree::selectionChangedSlot( QListViewItem *item ) { QString s; kdDebug()<<"void LibBrowseTree::selectionChangedSlot( QListViewItem *item )"<<endl; // determine our root... QListViewItem *t=item; while(t->parent()) t = t->parent(); if(t->text(0)=="Project cache") { if(item->depth()==2) { s=item->parent()->text(0)+"/"+item->text(0); } } else if(t->text(0)=="Search results") { if(item->depth()==3) { s=item->parent()->parent()->text(0); s+="/"; s+=item->parent()->text(0); s+="/"; s+=item->text(0); // selectPart( (part*)m_libDB->get(LibObject::PART,item->parent()->parent()->text(0),item->parent()->text(0),item->text(0)) ); // UpdatePreview(0); // display first subpart on initial selection } } else if(item->depth()==2) { // any library s=item->parent()->parent()->text(0); s+="/"; s+=item->parent()->text(0); s+="/"; s+=item->text(0); // m_part = (part*)libDB->get(LibObject::PART,item->parent()->parent()->text(0),item->parent()->text(0),item->text(0)); // selectPart( (part*)libDB->get(LibObject::PART,item->parent()->parent()->text(0),item->parent()->text(0),item->text(0)) ); // UpdatePreview(0); // display first subpart on initial selection } else if(item->depth()==1) { // any library, group QPixmap pm = m_libDB->getGroupImage( m_libObjectType, item->parent()->text(0), item->text(0) ); kdDebug()<<"Source = "<< item->parent()->text(0)<<endl; kdDebug()<<"Group = "<< item->text(0)<<endl; LibPath lp; lp.setSource( item->parent()->text(0) ); lp.setGroup( item->text(0) ); emit curName( QString() ); emit curDescr( QString() ); emit curPath( lp.text() ); emit previewImage( pm ); } else if(item->depth()==0) { LibPath lp; lp.setSource( item->text(0) ); emit curName( QString() ); emit curDescr( QString() ); emit curPath( lp.text() ); emit previewImage( QPixmap() ); } if(!s.isEmpty()) { kdDebug()<<"Path="<<s<<endl; m_object = m_libDB->get( m_libObjectType, item->parent()->parent()->text(0), item->parent()->text(0),item->text(0)); emit curName( m_object->name() ); emit curDescr( m_object->description() ); emit curPath( m_object->path().text() ); // emit previewImage( pm ); QPixmap pm; m_object->preview( pm ); emit previewImage( pm ); } } Index: Makefile.am =================================================================== RCS file: /cvsroot/reds/rapideds/src/cadlib/gui/Makefile.am,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile.am 12 Dec 2004 11:25:12 -0000 1.1.1.1 --- Makefile.am 26 Aug 2006 13:21:30 -0000 1.2 *************** *** 1,2 **** ! INCLUDES = -I$(top_srcdir)/src/common $(all_includes) METASOURCES = AUTO --- 1,7 ---- ! INCLUDES = -I$(top_srcdir)/src/cadlib/core -I$(top_srcdir)/src/common \ ! $(all_includes) METASOURCES = AUTO + libgui_la_LDFLAGS = $(all_libraries) + noinst_LTLIBRARIES = libgui.la + libgui_la_SOURCES = libbrowsetree.cpp + libgui_la_LIBADD = $(top_builddir)/src/ui/cadlib/libui-cadlib.la --- NEW FILE: libbrowsetree.h --- // file : libbrowsetree.h // Descr : // Author : Ricky White ( ri...@ne... ) // License : GNU GPL General Public License // Copyright : Copyright (C) Ricky White 2004 /////////////////////////////////////////////////////////////////////////////// #ifndef LIBBROWSETREE_H #define LIBBROWSETREE_H #include <qpixmap.h> #include <qstring.h> #include <klistview.h> #include "libdbmgr.h" /** Provide a KListView that knows how to browse the cad library for any type of object. @author Ricky White <ri...@ne...> */ class LibBrowseTree : public KListView { Q_OBJECT; public: LibBrowseTree( QWidget *parent, const char *name ); ~LibBrowseTree(); void setLibObjType(LibObject::OTYPE type); void showProjectCache( bool show ) { m_showPrjCache = show; initTree(); } QStringList supportedObjTypes(); signals: /// Signal emitted with preview image of just selected item void previewImage( const QPixmap &pm ); /// Signal emitted with path to item just selected in the tree void currentLibPath( LibPath &path ); void curName( QString name ); void curDescr( QString descr ); void curPath( QString path ); public slots: void setSearchQuerySlot(const QString &query); void searchSlot( QString query=QString() ); void selectionChangedSlot( QListViewItem *item ); void setObjectType( const QString &type ); protected: LibDbMgr *m_libDB; LibObject::OTYPE m_libObjectType; QListViewItem *m_searchResultItem; QListViewItem *m_prjCacheItem; QString m_curQuery; LibObject *m_object; bool m_showPrjCache; void addSource( const QString &source ); void LibBrowseTree::initTree(); }; #endif |
From: Ricky W. <ri...@us...> - 2006-08-26 13:22:04
|
Update of /cvsroot/reds/rapideds/src/common/cadobj In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28791/src/common/cadobj Modified Files: cadobj.h Log Message: Initial PCB framework Index: cadobj.h =================================================================== RCS file: /cvsroot/reds/rapideds/src/common/cadobj/cadobj.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** cadobj.h 31 Aug 2005 13:26:06 -0000 1.8 --- cadobj.h 26 Aug 2006 13:21:30 -0000 1.9 *************** *** 169,173 **** /** Indicate to the object that it should release any resources that are ! * persistant accross svae/load cycles such as designators because the * object is about to be deleated and not used again. */ --- 169,173 ---- /** Indicate to the object that it should release any resources that are ! * persistant accross save/load cycles such as designators because the * object is about to be deleated and not used again. */ |
Update of /cvsroot/reds/rapideds/src/cadlib/tools In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28791/src/cadlib/tools Modified Files: Makefile.am lslib.cpp Added Files: browselib-main.cpp browselibdlg.cpp browselibdlg.h dumpobj.cpp Removed Files: catlib.cpp Log Message: Initial PCB framework --- NEW FILE: browselibdlg.h --- // file : .h // Descr : // Author : Ricky White ( ri...@ne... ) // License : GNU GPL General Public License // Copyright : Copyright (C) Ricky White 2004 /////////////////////////////////////////////////////////////////////////////// #ifndef BROWSELIBDLG_H #define BROWSELIBDLG_H #include "browse_lib_form.h" /** @author Ricky White <ri...@ne...> */ class BrowseLibDlg : public BrowseLibForm { Q_OBJECT; public: BrowseLibDlg( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); virtual ~BrowseLibDlg() {} //public slots: void setCurName( QString name ); void setCurDescr( QString descr ); void setCurPath( QString path ); }; #endif --- NEW FILE: browselib-main.cpp --- // file : browselib-main.cpp // Descr : // Author : Ricky White ( ri...@ne... ) // License : GNU GPL General Public License // Copyright : Copyright (C) Ricky White 2004 /////////////////////////////////////////////////////////////////////////////// //#include "browselib.h" #include <kapplication.h> #include <kaboutdata.h> #include <kcmdlineargs.h> #include <klocale.h> #include "browselibdlg.h" static const char description[] = I18N_NOOP("Rapideds Library browser"); static const char version[] = "0.1"; static KCmdLineOptions options[] = { // { "+[URL]", I18N_NOOP( "Document to open" ), 0 }, KCmdLineLastOption }; int main(int argc, char **argv) { KAboutData about("browselib", I18N_NOOP("rapideds_libbrowse"), version, description, KAboutData::License_GPL, "(C) 2006 Ricky White", 0, 0, "ri...@ne..."); about.addAuthor( "Ricky White", 0, "ric...@ne..." ); KCmdLineArgs::init(argc, argv, &about); KCmdLineArgs::addCmdLineOptions( options ); KApplication app; BrowseLibDlg *mainWin = 0; if (app.isRestored()) { // RESTORE(BrowseLibDlg); } else { // no session.. just start up normally KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); /// @todo do something with the command line args here // mainWin = new BrowseLib(); // app.setMainWidget( mainWin ); // mainWin->show(); mainWin = new BrowseLibDlg(); app.setMainWidget( mainWin ); mainWin->show(); args->clear(); } // mainWin has WDestructiveClose flag by default, so it will delete itself. return app.exec(); } --- NEW FILE: dumpobj.cpp --- /*************************************************************************** catlib.cpp - Library Object dumper ------------------- begin : Mon Mar 10 2003 copyright : (C) 2003 by Ricky White email : rw...@ne... ***************************************************************************/ /*************************************************************************** * * * 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 <qstring.h> #include <kapplication.h> #include <kaboutdata.h> #include <kdebug.h> #include <kcmdlineargs.h> #include <klocale.h> #include <iostream> #include <stdlib.h> #include "../core/libdbmgr.h" using namespace std; static KAboutData about( "rapidEDS", "catlib", "Version 0.1", "rapidEDS Library Object Dumper", KAboutData::License_GPL, "(C) Ricky White March 2003", "", "http://reds.sourceforge.net", "ri...@ne..." ); static KCmdLineOptions options[] = { { "p", 0, 0 }, { "part", I18N_NOOP("Dump specified part"), 0 }, { "n", 0, 0 }, { "pinstyle", I18N_NOOP("Dump specified pinstyle"), 0 }, { "d", 0, 0 }, { "pad", I18N_NOOP("Dump specified pad"), 0 }, { "s", 0, 0 }, { "symbol", I18N_NOOP("Dump specified symbol"), 0 }, { "f", 0, 0 }, { "footprint", I18N_NOOP("Dump specified footprint"), 0 }, { "+source",I18N_NOOP("source library/group specification sourcename/group/spec. where spec can be nothing or wildcards"), 0 }, { 0, 0, 0 } // End of options. }; int main(int argc, char *argv[]) { KCmdLineArgs::init(argc, argv, &about,false); KCmdLineArgs::addCmdLineOptions( options ); KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); KApplication app(false,false); if(args->count()==0) { args->usage(); args->clear(); return EXIT_SUCCESS; } // Get a library database manager object LibDbMgr *dbmgr=LibDbMgr::instance(); LibPath lpath; LibPathList results; LibObject::OTYPE objtype; dbmgr->connect(); if(args->isSet("part")) objtype=LibObject::PART; else if(args->isSet("pinstyle")) objtype=LibObject::PINSTYLE; else if(args->isSet("symbol")) objtype=LibObject::SYMBOL; else if(args->isSet("footprint")) objtype=LibObject::FOOTPRINT; else { std::cout<<"ERROR:- unsupported object type"<<std::endl; args->usage(); args->clear(); delete dbmgr; return EXIT_FAILURE; } if(lpath.set(args->arg(0))) { cout<<endl; LibObject *obj = dbmgr->get(objtype,lpath); if(obj) { cout << obj->cat(); dbmgr->release(obj); } else { cout << "ERROR: \""<<lpath.text()<<"\" not found.\007"<<endl; args->clear(); delete dbmgr; return EXIT_FAILURE; } cout<<endl; } args->clear(); delete dbmgr; return EXIT_SUCCESS; } Index: Makefile.am =================================================================== RCS file: /cvsroot/reds/rapideds/src/cadlib/tools/Makefile.am,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile.am 12 Dec 2004 11:25:13 -0000 1.1.1.1 --- Makefile.am 26 Aug 2006 13:21:30 -0000 1.2 *************** *** 1,24 **** ! INCLUDES = -I$(top_srcdir)/src/common $(all_includes) ! METASOURCES = AUTO SUBDIRS = XML ! bin_PROGRAMS = rmlib lslib cplib catlib rmlib_SOURCES = rmlib.cpp - lslib_SOURCES = lslib.cpp - cplib_SOURCES = cplib.cpp - - catlib_SOURCES = catlib.cpp - catlib_LDADD = $(top_builddir)/src/common/librapideds-common.la \ - $(top_builddir)/src/cadlib/core/libcadlib-core.la $(top_builddir)/src/cadlib/core/XML/libcorexml.a $(LIB_KDEUI) \ - $(LIB_KDECORE) - cplib_LDADD = $(top_builddir)/src/common/librapideds-common.la \ - $(top_builddir)/src/cadlib/core/libcadlib-core.la $(top_builddir)/src/cadlib/core/XML/libcorexml.a $(LIB_KDEUI) \ - $(LIB_KDECORE) lslib_LDADD = $(top_builddir)/src/common/librapideds-common.la \ $(top_builddir)/src/cadlib/core/libcadlib-core.la $(top_builddir)/src/cadlib/core/XML/libcorexml.a $(LIB_KDECORE) \ $(LIB_KDEUI) rmlib_LDADD = $(top_builddir)/src/common/librapideds-common.la \ $(top_builddir)/src/cadlib/core/libcadlib-core.la $(top_builddir)/src/cadlib/core/XML/libcorexml.a $(LIB_KDECORE) \ $(LIB_KDEUI) --- 1,30 ---- ! INCLUDES = -I$(top_srcdir)/src/cadlib/core -I$(top_srcdir)/src/cadlib/gui \ ! -I$(top_srcdir)/src/common -I$(top_srcdir)/src/ui/cadlib $(all_includes) ! ##METASOURCES = AUTO SUBDIRS = XML ! bin_PROGRAMS = libbrowse rmlib lslib dumpobj rmlib_SOURCES = rmlib.cpp lslib_SOURCES = lslib.cpp + dumpobj_SOURCES = dumpobj.cpp lslib_LDADD = $(top_builddir)/src/common/librapideds-common.la \ $(top_builddir)/src/cadlib/core/libcadlib-core.la $(top_builddir)/src/cadlib/core/XML/libcorexml.a $(LIB_KDECORE) \ $(LIB_KDEUI) + + + dumpobj_LDADD = $(top_builddir)/src/common/librapideds-common.la \ + $(top_builddir)/src/cadlib/core/libcadlib-core.la $(top_builddir)/src/cadlib/core/XML/libcorexml.a $(LIB_KDECORE) \ + $(LIB_KDEUI) + rmlib_LDADD = $(top_builddir)/src/common/librapideds-common.la \ $(top_builddir)/src/cadlib/core/libcadlib-core.la $(top_builddir)/src/cadlib/core/XML/libcorexml.a $(LIB_KDECORE) \ $(LIB_KDEUI) + + + libbrowse_SOURCES = browselibdlg.cpp browselib-main.cpp + libbrowse_LDADD = $(top_builddir)/src/cadlib/core/libcadlib-core.la \ + $(top_builddir)/src/ui/cadlib/libui-cadlib.la $(top_builddir)/src/cadlib/gui/libgui.la \ + $(top_builddir)/src/cadlib/core/XML/libcorexml.a $(LIB_KDEUI) + libbrowse_LDFLAGS = $(KDE_RPATH) $(all_libraries) + Index: lslib.cpp =================================================================== RCS file: /cvsroot/reds/rapideds/src/cadlib/tools/lslib.cpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** lslib.cpp 12 Dec 2004 11:25:13 -0000 1.1.1.1 --- lslib.cpp 26 Aug 2006 13:21:30 -0000 1.2 *************** *** 83,86 **** --- 83,88 ---- else if(args->isSet("symbols")) objtype=LibObject::SYMBOL; + else if(args->isSet("footprints")) + objtype=LibObject::FOOTPRINT; else { --- NEW FILE: browselibdlg.cpp --- // file : .cpp // Descr : // Author : Ricky White ( ri...@ne... ) // License : GNU GPL General Public License // Copyright : Copyright (C) Ricky White 2004 /////////////////////////////////////////////////////////////////////////////// #include "browselibdlg.h" #include <qtable.h> #include <kcombobox.h> #include <kdebug.h> #include "libobject.h" BrowseLibDlg::BrowseLibDlg( QWidget* parent, const char* name, bool modal, WFlags fl ) : BrowseLibForm( parent, name, modal, fl) { objType_CB->clear(); objType_CB->insertStringList( LibObject::getObjectTypes() ); connect(objType_CB,SIGNAL( activated(const QString &)), tree_LV,SLOT(setObjectType( const QString & ) ) ); connect( tree_LV, SIGNAL( curName(QString) ), SLOT( setCurName(QString) ) ); connect( tree_LV, SIGNAL( curDescr(QString) ), SLOT( setCurDescr(QString) ) ); connect( tree_LV, SIGNAL( curPath(QString) ), SLOT( setCurPath(QString) ) ); } void BrowseLibDlg::setCurName( QString name ) { properties_TB->setText( 0, 0, name ); } void BrowseLibDlg::setCurDescr( QString descr ) { properties_TB->setText( 1, 0, descr ); } void BrowseLibDlg::setCurPath( QString path ) { properties_TB->setText( 3, 0, path ); } #include "browselibdlg.moc.cpp" --- catlib.cpp DELETED --- |
From: Ricky W. <ri...@us...> - 2006-08-26 13:22:03
|
Update of /cvsroot/reds/rapideds/src/cadlib/core/XML In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28791/src/cadlib/core/XML Modified Files: Makefile.am locallib.cpp locallib.h Added Files: loadfootprintXML.cpp loadfootprintXML.h Log Message: Initial PCB framework --- NEW FILE: loadfootprintXML.h --- /*************************************************************************** loadfootprintXML.h - Load an XML footprint ------------------- begin : 1/8/2006 copyright : (C) 2006 by Ricky White email : rw...@ne... ***************************************************************************/ /*************************************************************************** * * * 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. * * * ***************************************************************************/ #ifndef LOADFOOTPRINTXML_H #define LOADFOOTPRINTXML_H //#include "locallib.h" #include <kurl.h> #include "../libsource.h" #include "../libfootprint.h" /** Local library support class. Handle local library files stored as XML. * Used to handle both a lical library and the project cache since both * use the same format just at different locations. * * @author Ricky White */ class LoadFootprintXML { public: LoadFootprintXML(LibSource *libsrc); ~LoadFootprintXML(); /** Parse the supplied XML document into the actual part. * @param doc XML document * @param sym to receive the newly loadad data * @returns true on success, false on failure */ bool parseDoc( QDomDocument &doc, LibFootprint &fp ); Symbol read( QString xmldata ); /** Return a string containing the XML representation of the footprint */ QString write( Symbol &sym ); /** Loads the specified footprint file and parses the XML * @param URL of the file to load * @returns footprint representing the loaded data */ LibFootprint *load( KURL url ); /** Save the supplied footprint to the specified location * @param url location to save the footprint to * @param sym symbol object to save * @returns true if successful, false on error */ bool save( KURL url, Symbol &sym ); protected: /** Parse the supplied XML document into the actual footprint. * @param doc XML document * @returns true on success, false on failure */ bool parseDoc( QDomDocument &doc ); LibSource *m_libSrc; static const bool debug; }; #endif Index: locallib.h =================================================================== RCS file: /cvsroot/reds/rapideds/src/cadlib/core/XML/locallib.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** locallib.h 12 Dec 2004 12:51:40 -0000 1.1 --- locallib.h 26 Aug 2006 13:21:29 -0000 1.2 *************** *** 25,28 **** --- 25,29 ---- #include "loadpinstylexml.h" #include "loadsymXML.h" + #include "loadfootprintXML.h" #include "indexxml.h" *************** *** 149,156 **** LoadSymXML *m_loadSymbol; LoadPinStyleXML *m_loadPinStyle; IndexXML m_partIdx; IndexXML m_symbolIdx; IndexXML m_pinstyleIdx; ! KURL m_path; QString m_name; --- 150,160 ---- LoadSymXML *m_loadSymbol; LoadPinStyleXML *m_loadPinStyle; + LoadFootprintXML *m_loadFootprint; IndexXML m_partIdx; IndexXML m_symbolIdx; IndexXML m_pinstyleIdx; ! IndexXML m_footprintIdx; ! ! KURL m_path; QString m_name; --- NEW FILE: loadfootprintXML.cpp --- /*************************************************************************** loadfootprintXML.cpp - Load an XML footprint ------------------- begin : 1/8/2006 copyright : (C) 2006 by Ricky White email : rw...@ne... ***************************************************************************/ /*************************************************************************** * * * 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 <qdom.h> #include <qtextstream.h> #include <kfile.h> #include <kdebug.h> //#include "../pin.h" //#include "../symcomp.h" //#include "../scmp_arc.h" //#include "../scmp_line.h" //#include "../scmp_rect.h" //#include "../scmp_triangle.h" //#include "../scmp_symbol.h" #include "../libsource.h" #include "loadfootprintXML.h" /** set to true to enable debug output for this lass. */ const bool LoadFootprintXML::debug=false; LoadFootprintXML::LoadFootprintXML(LibSource *libsrc) { m_libSrc = libsrc; } LoadFootprintXML::~LoadFootprintXML() { } LibFootprint *LoadFootprintXML::load( KURL url ) { LibFootprint *fp = new LibFootprint; QDomDocument xmldoc; kdDebug(debug) << "LibFootprint LoadFootprintXML::load(\""<<url.path()<<"\")"<<endl; url.path(); QFile f( url.path() ); // Load the xml project file if(!f.open( IO_ReadOnly ) ) { kdDebug() << "Failed to open rfpt file" << endl; return 0; } if(!xmldoc.setContent( &f ) ) { f.close(); kdDebug() << "Error parsing XML library file!"<<endl; return 0; } kdDebug(debug)<<"XML Document loaded"<<endl; f.close(); parseDoc( xmldoc, *fp ); return fp; } bool LoadFootprintXML::parseDoc( QDomDocument &doc, LibFootprint &fp ) { QDomElement root = doc.documentElement(); QDomNode node, n; QDomDocumentType dt = doc.doctype(); if( dt.name()!="RapidEDS-FOOTPRINT-v01" ) { kdDebug(debug)<<"LoadFootprintXML::parseDoc( QDomDocument &doc )" <<" ERROR :- incorrect document type" <<endl; kdDebug(debug)<<"doctype found = \""<<dt.name()<<"\""<<endl; return false; } // Scan through the document processing nodes as we go. node = root; while ( !node.isNull() ) { if( node.isElement() && node.nodeName() == "footprint" ) { kdDebug()<<"FOOTPRINT:"<<endl; QDomNamedNodeMap nnm = node.attributes(); // kdDebug()<< fp.setName( nnm.namedItem("name").nodeValue() ); fp.setDescription( nnm.namedItem("descr").nodeValue() ); fp.setVersion( nnm.namedItem("version").nodeValue().toInt() ); //fp.setPinGrid( Units(nnm.namedItem("pingrid").nodeValue()) ); //fp.setSize( Units(nnm.namedItem("x").nodeValue()), // Units(nnm.namedItem("y").nodeValue()) ); // iterate through children parsing as we go. kdDebug()<<"name="<<fp.name()<<", descr="<<fp.description()<<", version="<<fp.version()<<endl; n = node.firstChild(); while(!n.isNull()) { nnm = n.attributes(); if(n.nodeName()=="layer") { kdDebug()<<"parsing a layer"<<endl; QDomNode layer_obj_node = n.firstChild(); // symcomp on a single layer while( !layer_obj_node.isNull() ) { SymComp *sc = SymComp::factoryXML(layer_obj_node,m_libSrc); if( sc!=0 ) { kdDebug()<<"object = ["<<sc->getXML(1)<<"]"<<endl; // sym.addComp(sc); } layer_obj_node = layer_obj_node.nextSibling(); } } // Layer n = n.nextSibling(); } } node = root.nextSibling(); } kdDebug()<<"END FOOTPRINT"<<endl; return true; } // Write support // yes this class is called LoadFootprintXML., This will change in the near future. QString LoadFootprintXML::write( Symbol &sym ) { return sym.getXML(); } bool LoadFootprintXML::save( KURL url, Symbol &sym ) { kdDebug(debug) << "Symbol LoadFootprintXML::save(\""<<url.path()<<"\", \""<<sym.name()<<"\")"<<endl; QFile f( url.path() ); if(!f.open( IO_WriteOnly ) ) { kdDebug() << "Failed to open/create XML symbol file" << endl; return false; } QTextStream out(&f); out << write(sym); f.close(); return true; } Index: locallib.cpp =================================================================== RCS file: /cvsroot/reds/rapideds/src/cadlib/core/XML/locallib.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** locallib.cpp 12 Dec 2004 12:51:40 -0000 1.1 --- locallib.cpp 26 Aug 2006 13:21:29 -0000 1.2 *************** *** 33,36 **** --- 33,37 ---- m_loadSymbol = new LoadSymXML(this); m_loadPinStyle = new LoadPinStyleXML(this); + m_loadFootprint = new LoadFootprintXML(this); m_name = name; m_path.setPath(path); *************** *** 38,41 **** --- 39,43 ---- m_symbolIdx.load( makeIndexPath(LibObject::SYMBOL) ); m_pinstyleIdx.load( makeIndexPath(LibObject::PINSTYLE) ); + m_footprintIdx.load( makeIndexPath(LibObject::FOOTPRINT) ); } *************** *** 47,50 **** --- 49,53 ---- delete m_loadPinStyle; delete m_loadSymbol; + delete m_loadFootprint; } *************** *** 128,131 **** --- 131,137 ---- obj=0; break; + case LibObject::FOOTPRINT: // @TODO Implement + obj = static_cast<LibObject*>( m_loadFootprint->load(url) ); + break; default: obj=0; kdDebug(debug)<<"ERROR:LibObject *LocalLib::get(...) objtype="<<objtype *************** *** 163,166 **** --- 169,175 ---- m_pinstyleIdx.findItem(group,"*",lst); break; + case LibObject::FOOTPRINT: // @TODO Implement + m_footprintIdx.findItem(group,"*",lst); + break; default: kdDebug(debug)<<"ERROR: getObjList(...) Unsupported object type = "<<objtype<<endl; *************** *** 204,207 **** --- 213,219 ---- grplst = (m_symbolIdx.getGroupList()).grep(r); break; + case LibObject::FOOTPRINT: + grplst = (m_footprintIdx.getGroupList()).grep(r); + break; default: kdDebug(debug)<<"ERROR: Unsupported object type"<<endl; *************** *** 224,227 **** --- 236,242 ---- m_symbolIdx.findItem(*git,name,olst); break; + case LibObject::FOOTPRINT: + m_footprintIdx.findItem(*git,name,olst); + break; default: kdDebug(debug)<<"ERROR: Unsupported object type"<<endl; *************** *** 260,263 **** --- 275,281 ---- file = m_path.path()+"/symbols/"+group+"/"+group+".xpm"; break; + case LibObject::FOOTPRINT: + file = m_path.path()+"/footprints/"+group+"/"+group+".xpm"; + break; default: kdError()<<"QPixmap LocalLib::getGroupImage("<<objtype<<", "<<group<<") : Unsupported objtype!"<<endl; *************** *** 284,287 **** --- 302,308 ---- return m_symbolIdx.getGroupList(); break; + case LibObject::FOOTPRINT: + return m_footprintIdx.getGroupList(); + break; default: kdError()<<"LocalLib::getGroupList( "<<objtype<<" ) : UNSUPPORTED object type"<<endl; *************** *** 322,325 **** --- 343,348 ---- m_symbolIdx.update(); break; + case LibObject::FOOTPRINT: // @TODO Implement + break; default: kdError()<<"LocalLib::add( "<<objtype<<", "<<lpath.text()<<", "<<obj<<" ) : UNSUPPORTED object type"<<endl; *************** *** 357,360 **** --- 380,385 ---- case LibObject::SYMBOL: return KURL(m_path.path()+"/symbols/"+group+"/"+name+".rsym"); + case LibObject::FOOTPRINT: + return KURL(m_path.path()+"/footprints/"+group+"/"+name+".rfpt"); default: kdError()<<"LocalLib::makePath( "<<objtype<<", "<<group *************** *** 375,378 **** --- 400,405 ---- case LibObject::SYMBOL: return KURL(m_path.path()+"/symbols/symbols.idx"); + case LibObject::FOOTPRINT: + return KURL(m_path.path()+"/footprints/footprints.idx"); default: kdError()<<"LocalLib::makeIndexPath( "<<objtype Index: Makefile.am =================================================================== RCS file: /cvsroot/reds/rapideds/src/cadlib/core/XML/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 12 Dec 2004 12:51:40 -0000 1.1 --- Makefile.am 26 Aug 2006 13:21:29 -0000 1.2 *************** *** 1,7 **** INCLUDES = -I$(top_srcdir)/src/cadlib/core -I$(top_srcdir)/src/common $(all_includes) METASOURCES = AUTO lib_LIBRARIES = libcorexml.a ! libcorexml_a_SOURCES = indexxml.cpp loadpartXML.cpp loadpinstylexml.cpp\ ! loadsymXML.cpp locallib.cpp prjlibcache.cpp noinst_HEADERS = indexxml.h loadpartXML.h loadpinstylexml.h loadsymXML.h\ locallib.h prjlibcache.h --- 1,15 ---- INCLUDES = -I$(top_srcdir)/src/cadlib/core -I$(top_srcdir)/src/common $(all_includes) METASOURCES = AUTO + lib_LIBRARIES = libcorexml.a ! ! libcorexml_a_SOURCES = indexxml.cpp loadpartXML.cpp \ ! loadpinstylexml.cpp loadsymXML.cpp locallib.cpp prjlibcache.cpp loadfootprintXML.cpp noinst_HEADERS = indexxml.h loadpartXML.h loadpinstylexml.h loadsymXML.h\ locallib.h prjlibcache.h + + + + ##lib_LTLIBRARIES = libcadlibcorexml.la + ##libcadlibcorexml_la_SOURCES = indexxml.cpp loadpartXML.cpp \ + ## loadpinstylexml.cpp loadsymXML.cpp locallib.cpp prjlibcache.cpp loadfootprintXML.cpp |
From: Ricky W. <ri...@us...> - 2006-08-26 13:22:03
|
Update of /cvsroot/reds/rapideds/src/cadlib/core In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28791/src/cadlib/core Modified Files: Makefile.am libobject.h part.cpp part.h symbol.cpp symbol.h symcomp.h Added Files: libfootprint.cpp libfootprint.h libobject.cpp Log Message: Initial PCB framework --- NEW FILE: libobject.cpp --- #include "libobject.h" char *LibObject::names[] = {"part","symbol","pinstyle","image","footprint"}; LibObject::LibObject() { } QStringList LibObject::getObjectTypes() { QStringList l; for(int i=0; i<_OTYPE_COUNT_; i++) { l += names[i]; } return l; } LibObject::OTYPE LibObject::typeFromString( QString type ) { for(int i=0; i<_OTYPE_COUNT_; i++) { if(type==names[i]) return OTYPE(i); } return OTYPE(-1); } Index: libobject.h =================================================================== RCS file: /cvsroot/reds/rapideds/src/cadlib/core/libobject.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** libobject.h 12 Dec 2004 12:51:40 -0000 1.1 --- libobject.h 26 Aug 2006 13:21:29 -0000 1.2 *************** *** 17,20 **** --- 17,21 ---- #ifndef LIBOBJECT_H #define LIBOBJECT_H + #include <qpixmap.h> #include <qstring.h> #include <klocale.h> *************** *** 31,35 **** { public: ! enum OTYPE { PART=0, SYMBOL, PINSTYLE, IMAGE, _OTYPE_COUNT_ }; virtual ~LibObject() { ; } /** @returns An index of the object type */ --- 32,40 ---- { public: ! enum OTYPE { PART=0, SYMBOL, PINSTYLE, IMAGE, FOOTPRINT, _OTYPE_COUNT_ }; ! static QStringList getObjectTypes(); ! static OTYPE typeFromString( QString type ); ! LibObject(); ! virtual ~LibObject() { ; } /** @returns An index of the object type */ *************** *** 68,72 **** QString date() { return m_date; } QString time() { return m_time; } ! protected: --- 73,77 ---- QString date() { return m_date; } QString time() { return m_time; } ! virtual void preview( QPixmap &image, int subobjectid=0 ) {;} protected: *************** *** 75,78 **** --- 80,85 ---- unsigned int m_version; QString m_date, m_time; + + static char *names[]; }; Index: symbol.cpp =================================================================== RCS file: /cvsroot/reds/rapideds/src/cadlib/core/symbol.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** symbol.cpp 17 Jul 2005 17:54:26 -0000 1.4 --- symbol.cpp 26 Aug 2006 13:21:29 -0000 1.5 *************** *** 182,183 **** --- 182,195 ---- return UnitsRect( loc.x(), loc.y(), m_sizex, m_sizey ); } + + + void Symbol::preview( QPixmap &image, int subobjectid ) + { + image.resize(180,180); + image.fill(); + QPainter p; + p.begin(&image); + p.setPen( QPen::red ); // red outline + draw( p, Units(5,Units::MM),Units(5,Units::MM),2); + p.end(); + } --- NEW FILE: libfootprint.cpp --- // file : .cpp // Descr : // Author : Ricky White ( ri...@ne... ) // License : GNU GPL General Public License // Copyright : Copyright (C) Ricky White 2004 /////////////////////////////////////////////////////////////////////////////// #include "libfootprint.h" #include "../../images/bustool.xpm" LibFootprint::LibFootprint() : LibObject() { } LibFootprint::~LibFootprint() { } /** Access the list of SymComp objects for a specific layer class name. \param LayerClass The class of layer to return the symcomp objects for. \returns A list of pointers to SymComp objects. */ SymCompList &LibFootprint::getSymCompList( QString LayerClass ) { if( m_LayerMap.find(LayerClass)!=m_LayerMap.end() ) return m_LayerMap[LayerClass]; else return m_EmptyList; // not found, return an empty list } /** Draw a previer image on the supplied QPixmap \param image pixmap to draw on \param subobjectid index of sub object, no use for footprint, ignored */ void LibFootprint::preview( QPixmap &image, int subobjectid ) { image = QPixmap(bustool); /// @FIXME test pixmap only, draw image onto pixmap here } void LibFootprint::addLayer( QString LayerClass ) { //m_LayerMap[LayerClass] } void LibFootprint::addComp( QString LayerClass, SymComp *s ) { m_LayerMap[LayerClass].push_back(s); } QString LibFootprint::cat() { return QString( i18n( "Path = \"%1\"\n" "Description = \"%2\"\n" "Version = %3\n" )).arg(m_path.text()) .arg(description()) .arg(version()); } Index: symcomp.h =================================================================== RCS file: /cvsroot/reds/rapideds/src/cadlib/core/symcomp.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** symcomp.h 16 Jul 2005 13:41:04 -0000 1.3 --- symcomp.h 26 Aug 2006 13:21:29 -0000 1.4 *************** *** 18,22 **** #ifndef SYMCOMP_H #define SYMCOMP_H ! #include <qdom.h> #include <qstring.h> --- 18,22 ---- #ifndef SYMCOMP_H #define SYMCOMP_H ! #include <list> #include <qdom.h> #include <qstring.h> *************** *** 80,82 **** --- 80,84 ---- }; + typedef std::list<SymComp*> SymCompList; + #endif Index: Makefile.am =================================================================== RCS file: /cvsroot/reds/rapideds/src/cadlib/core/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.am 17 Jul 2005 16:30:59 -0000 1.2 --- Makefile.am 26 Aug 2006 13:21:29 -0000 1.3 *************** *** 5,15 **** libcadlib_core_la_LDFLAGS = $(all_libraries) libcadlib_core_la_SOURCES = dbsql.cpp libdbmgr.cpp libpath.cpp part.cpp pin.cpp \ ! pinstyle.cpp subpart.cpp scmp_arc.cpp scmp_line.cpp scmp_rect.cpp scmp_symbol.cpp \ ! scmp_triangle.cpp symbol.cpp symcomp.cpp stringsep.cpp strsepext.cpp \ ! libASVD.cpp noinst_HEADERS = dbsql.h libdbmgr.h libobject.h libpath.h part.h pinstyle.h \ ! scmp_arc.h scmp_line.h scmp_rect.h scmp_symbol.h scmp_triangle.h subpart.h \ ! symbol.h symcomp.h pin.h libsource.h stringsep.h strsepext.h libASVD.h libcadlib_core_la_LIBADD = $(top_builddir)/src/common/librapideds-common.la \ --- 5,16 ---- libcadlib_core_la_LDFLAGS = $(all_libraries) libcadlib_core_la_SOURCES = dbsql.cpp libdbmgr.cpp libpath.cpp part.cpp pin.cpp \ ! pinstyle.cpp subpart.cpp scmp_arc.cpp scmp_line.cpp scmp_rect.cpp scmp_symbol.cpp \ ! scmp_triangle.cpp symbol.cpp symcomp.cpp stringsep.cpp strsepext.cpp libASVD.cpp \ ! libfootprint.cpp libobject.cpp noinst_HEADERS = dbsql.h libdbmgr.h libobject.h libpath.h part.h pinstyle.h \ ! scmp_arc.h scmp_line.h scmp_rect.h scmp_symbol.h scmp_triangle.h subpart.h \ ! symbol.h symcomp.h pin.h libsource.h stringsep.h strsepext.h libASVD.h \ ! libfootprint.h libcadlib_core_la_LIBADD = $(top_builddir)/src/common/librapideds-common.la \ Index: symbol.h =================================================================== RCS file: /cvsroot/reds/rapideds/src/cadlib/core/symbol.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** symbol.h 17 Jul 2005 17:54:26 -0000 1.4 --- symbol.h 26 Aug 2006 13:21:29 -0000 1.5 *************** *** 82,85 **** --- 82,87 ---- SymComp::FLIPPING flipping() { return m_flip; } + virtual void preview( QPixmap &image, int subobjectid ); + protected: // Protected attributes bool m_isValid; Index: part.cpp =================================================================== RCS file: /cvsroot/reds/rapideds/src/cadlib/core/part.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** part.cpp 12 Dec 2004 12:51:40 -0000 1.1 --- part.cpp 26 Aug 2006 13:21:29 -0000 1.2 *************** *** 171,172 **** --- 171,192 ---- return str; } + + + void Part::preview( QPixmap &image, int subobjectid ) + { + SubPart *sp = Part::getSubpart( subobjectid ); + kdDebug() << "WIDTH = "<<image.width()<<endl; + //image.resize(180,180); + image.resize(180,180); + image.fill(); + if(sp) + { + QPainter p; + p.begin(&image); + p.setPen( QPen::red ); // red outline + sp->setPinLength(2); + sp->draw(p,Units(5,Units::MM),Units(5,Units::MM),2); + p.end(); + } + } + Index: part.h =================================================================== RCS file: /cvsroot/reds/rapideds/src/cadlib/core/part.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** part.h 12 Dec 2004 12:51:40 -0000 1.1 --- part.h 26 Aug 2006 13:21:29 -0000 1.2 *************** *** 71,75 **** bool checkMd5(QCString md5str); ! protected: // Protected attributes /**list of subparts */ --- 71,76 ---- bool checkMd5(QCString md5str); ! virtual void preview( QPixmap &image, int subobjectid ); ! protected: // Protected attributes /**list of subparts */ --- NEW FILE: libfootprint.h --- // file : libfootprint.h.h // Descr : // Author : Ricky White ( ri...@ne... ) // License : GNU GPL General Public License // Copyright : Copyright (C) Ricky White 2006 /////////////////////////////////////////////////////////////////////////////// #ifndef LIBFOOTPRINT_H #define LIBFOOTPRINT_H #include <map> #include <qstring.h> #include "units.h" #include "unitsrect.h" #include "libobject.h" #include "symcomp.h" /** Holds information about how a footprint should look. @author Ricky White */ class LibFootprint : public LibObject { public: LibFootprint(); ~LibFootprint(); virtual LibObject:: OTYPE getTypeId() const { return FOOTPRINT; } virtual QString getTypeName() const { return QString("Footprint"); } virtual SymCompList &getSymCompList( QString LayerClass ); virtual void preview( QPixmap &image, int subobjectid=0 ); virtual void addLayer( QString LayerClass ); virtual void addComp( QString LayerClass, SymComp *s ); virtual QString cat(); protected: QString m_descr, m_author; QString m_date, m_time; unsigned int m_version; UnitsPt m_hotPt; // hotspot for connection (pingrid units) Units m_fixX, m_fixY; // location connected to component (pingrid units) typedef std::map<QString,SymCompList> LAYER_MAP; LAYER_MAP m_LayerMap; SymCompList m_EmptyList; }; #endif |
From: Ricky W. <ri...@us...> - 2006-08-26 13:22:03
|
Update of /cvsroot/reds/rapideds/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28791/src Modified Files: Makefile.am Log Message: Initial PCB framework Index: Makefile.am =================================================================== RCS file: /cvsroot/reds/rapideds/src/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.am 14 Jul 2005 17:39:32 -0000 1.6 --- Makefile.am 26 Aug 2006 13:21:29 -0000 1.7 *************** *** 28,32 **** rapideds_LDADD = $(top_builddir)/src/common/librapideds-common.la \ $(top_builddir)/src/cadlib/core/libcadlib-core.la $(top_builddir)/src/cadlib/core/XML/libcorexml.a \ ! $(top_builddir)/src/schedit/libschedit_part.la $(top_builddir)/sqlite/libsqlite.la -lkmdi $(LIB_KPARTS) # this is where the desktop file will go --- 28,33 ---- rapideds_LDADD = $(top_builddir)/src/common/librapideds-common.la \ $(top_builddir)/src/cadlib/core/libcadlib-core.la $(top_builddir)/src/cadlib/core/XML/libcorexml.a \ ! $(top_builddir)/src/schedit/libschedit_part.la $(top_builddir)/sqlite/libsqlite.la \ ! $(top_builddir)/src/pcbedit/libpcbedit.la -lkmdi $(LIB_KPARTS) # this is where the desktop file will go *************** *** 52,54 **** # this is where the part's XML-GUI resource file goes partrcdir = $(kde_datadir)/rapidedspart ! SUBDIRS = images ui projectmgr interfaces common cadlib schedit default_config --- 53,56 ---- # this is where the part's XML-GUI resource file goes partrcdir = $(kde_datadir)/rapidedspart ! SUBDIRS = images ui projectmgr interfaces common cadlib schedit default_config \ ! pcbedit |
From: Ricky W. <ri...@us...> - 2006-08-26 13:22:02
|
Update of /cvsroot/reds/rapideds In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28791 Modified Files: rapideds.kdevelop Log Message: Initial PCB framework Index: rapideds.kdevelop =================================================================== RCS file: /cvsroot/reds/rapideds/rapideds.kdevelop,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** rapideds.kdevelop 2 Jan 2006 18:21:08 -0000 1.10 --- rapideds.kdevelop 26 Aug 2006 13:21:29 -0000 1.11 *************** *** 31,39 **** <language>SQL</language> </secondaryLanguages> ! <versioncontrol></versioncontrol> </general> <kdevautoproject> <general> ! <activetarget>src/schedit/schobj/librapideds_schobj.la</activetarget> <useconfiguration>default</useconfiguration> </general> --- 31,39 ---- <language>SQL</language> </secondaryLanguages> ! <versioncontrol/> </general> <kdevautoproject> <general> ! <activetarget>src/rapideds</activetarget> <useconfiguration>default</useconfiguration> </general> *************** *** 51,57 **** <atest/> <check_designatormgr/> </runarguments> <customdirectory>/</customdirectory> ! <programargs></programargs> <terminal>false</terminal> <autocompile>true</autocompile> --- 51,58 ---- <atest/> <check_designatormgr/> + <libbrowse/> </runarguments> <customdirectory>/</customdirectory> ! <programargs/> <terminal>false</terminal> <autocompile>true</autocompile> *************** *** 86,102 **** <envvars/> <configargs>--enable-libsuffix=64 --with-qt-dir=/usr/lib64/qt-3.3/ -with-qt-libraries=/usr/lib64/qt-3.3/lib/</configargs> ! <builddir></builddir> ! <topsourcedir></topsourcedir> ! <cppflags></cppflags> ! <ldflags></ldflags> <ccompiler>kdevgccoptions</ccompiler> <cxxcompiler>kdevgppoptions</cxxcompiler> <f77compiler>kdevpgf77options</f77compiler> ! <ccompilerbinary></ccompilerbinary> <cxxcompilerbinary>g++</cxxcompilerbinary> ! <f77compilerbinary></f77compilerbinary> ! <cflags></cflags> <cxxflags>-Wno-non-virtual-dtor</cxxflags> ! <f77flags></f77flags> </default> </configurations> --- 87,103 ---- <envvars/> <configargs>--enable-libsuffix=64 --with-qt-dir=/usr/lib64/qt-3.3/ -with-qt-libraries=/usr/lib64/qt-3.3/lib/</configargs> ! <builddir/> ! <topsourcedir/> ! <cppflags/> ! <ldflags/> <ccompiler>kdevgccoptions</ccompiler> <cxxcompiler>kdevgppoptions</cxxcompiler> <f77compiler>kdevpgf77options</f77compiler> ! <ccompilerbinary/> <cxxcompilerbinary>g++</cxxcompilerbinary> ! <f77compilerbinary/> ! <cflags/> <cxxflags>-Wno-non-virtual-dtor</cxxflags> ! <f77flags/> </default> </configurations> *************** *** 107,114 **** </envvars> <abortonerror>false</abortonerror> ! <numberofjobs>6</numberofjobs> <dontact>false</dontact> ! <makebin></makebin> <prio>0</prio> </make> <subclassing> --- 108,116 ---- </envvars> <abortonerror>false</abortonerror> ! <numberofjobs>4</numberofjobs> <dontact>false</dontact> ! <makebin/> <prio>0</prio> + <runmultiplejobs>true</runmultiplejobs> </make> <subclassing> *************** *** 176,184 **** <general> <dbgshell>libtool</dbgshell> ! <programargs></programargs> ! <gdbpath></gdbpath> ! <configGdbScript></configGdbScript> ! <runShellScript></runShellScript> ! <runGdbScript></runGdbScript> <breakonloadinglibs>true</breakonloadinglibs> <separatetty>false</separatetty> --- 178,186 ---- <general> <dbgshell>libtool</dbgshell> ! <programargs/> ! <gdbpath/> ! <configGdbScript/> ! <runShellScript/> ! <runGdbScript/> <breakonloadinglibs>true</breakonloadinglibs> <separatetty>false</separatetty> *************** *** 203,207 **** <docsystem>Doxygen Documentation Collection</docsystem> <docurl>${APPNAMELC}.tag</docurl> ! <usermanualurl></usermanualurl> </projectdoc> </kdevdocumentation> --- 205,209 ---- <docsystem>Doxygen Documentation Collection</docsystem> <docurl>${APPNAMELC}.tag</docurl> ! <usermanualurl/> </projectdoc> </kdevdocumentation> *************** *** 240,244 **** </qt> <creategettersetter> ! <prefixGet></prefixGet> <prefixSet>set</prefixSet> <prefixVariable>m_,_</prefixVariable> --- 242,246 ---- </qt> <creategettersetter> ! <prefixGet/> <prefixSet>set</prefixSet> <prefixVariable>m_,_</prefixVariable> |
From: Ricky W. <ri...@us...> - 2006-08-26 13:22:02
|
Update of /cvsroot/reds/rapideds/src/cadlib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28791/src/cadlib Modified Files: Makefile.am Log Message: Initial PCB framework Index: Makefile.am =================================================================== RCS file: /cvsroot/reds/rapideds/src/cadlib/Makefile.am,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile.am 12 Dec 2004 11:25:12 -0000 1.1.1.1 --- Makefile.am 26 Aug 2006 13:21:29 -0000 1.2 *************** *** 1,3 **** INCLUDES = -I$(top_srcdir)/src/common $(all_includes) METASOURCES = AUTO ! SUBDIRS = core tools gui scripts --- 1,3 ---- INCLUDES = -I$(top_srcdir)/src/common $(all_includes) METASOURCES = AUTO ! SUBDIRS = core gui tools scripts |
From: Ricky W. <ri...@us...> - 2006-08-26 13:21:37
|
Update of /cvsroot/reds/rapideds/src/images In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28791/src/images Added Files: pcb_editlayers_tool.xpm pcb_footprint_tool.xpm pcb_pad_tool.xpm pcb_track_tool.xpm Log Message: Initial PCB framework --- NEW FILE: pcb_footprint_tool.xpm --- /* XPM */ static const char *pcb_footprint_tool[]={ "32 32 3 1", ". c None", "a c #ff0000", "# c #ffff00", "................................", "................................", "...........##########...........", "......aaa..#..#..#..#..aaa......", ".....aaaaa.#..#..#..#.aaaaa.....", ".....aaaaa.#...##...#.aaaaa.....", ".....aaaaa.#........#.aaaaa.....", "......aaa..#........#..aaa......", "...........#........#...........", "......aaa..#........#..aaa......", ".....aaaaa.#........#.aaaaa.....", ".....aaaaa.#........#.aaaaa.....", ".....aaaaa.#........#.aaaaa.....", "......aaa..#........#..aaa......", "...........#........#...........", "......aaa..#........#..aaa......", ".....aaaaa.#........#.aaaaa.....", ".....aaaaa.#........#.aaaaa.....", ".....aaaaa.#........#.aaaaa.....", "......aaa..#........#..aaa......", "...........#........#...........", "......aaa..#........#..aaa......", ".....aaaaa.#........#.aaaaa.....", ".....aaaaa.#........#.aaaaa.....", ".....aaaaa.#........#.aaaaa.....", "......aaa..#........#..aaa......", "...........##########...........", "................................", "................................", "................................", "................................", "................................"}; --- NEW FILE: pcb_editlayers_tool.xpm --- /* XPM */ static const char *pcb_editlayers_tool[]={ "32 32 6 1", ". c None", "# c #0000ff", "c c #00ff00", "d c #00ffff", "a c #303030", "b c #ff0000", "................................", "................................", "................................", "................................", ".##########################.....", ".##########################.....", ".##########################.....", ".aaaaaaaaaaaaaaaaaaaaaaaaaa.....", ".aaaaaaaaaaaaaaaaaaaaaaaaaa.....", ".bbbbbbbbbbbbbbbbbbbbbbbbbb.....", ".bbbbbbbbbbbbbbbbbbbbbbbbbb.....", ".bbbbbbbbbbbbbbbbbbbbbbbbbb.....", ".aaaaaaaaaaaaaaaaaaaaaaaaaa.....", ".aaaaaaaaaaaaaaaaaaaaaaaaaa.....", ".cccccccccccccccccccccccccc.....", ".cccccccccccccccccccccccccc.....", ".cccccccccccccccccccccccccc.....", ".aaaaaaaaaaaaaaaaaaaaaaaaaa.....", ".aaaaaaaaaaaaaaaaaaaaaaaaaa.....", ".dddddddddddddddddddddddddd.....", ".dddddddddddddddddddddddddd.....", ".dddddddddddddddddddddddddd.....", "................................", "................................", "................................", "................................", "................................", "................................", "................................", "................................", "................................", "................................"}; --- NEW FILE: pcb_track_tool.xpm --- /* XPM */ static const char *pcb_track_tool[]={ "32 32 2 1", ". c None", "# c #0000ff", "................................", "................................", "######.####.####.####.#...#.....", "..#....#..#.#..#.#....#..#......", "..#....####.#..#.#....#.#.......", "..#....##...####.#....###.......", "..#....#.#..#..#.#....#..#......", "..#....#..#.#..#.####.#...#.....", "................................", "................................", "................................", "................................", ".....######################.....", ".....######################.....", ".....##.........................", ".....##.........................", ".....##.........................", ".....##.........................", ".....##.........................", ".....##.........................", ".....##.........................", ".....##.........................", ".....##.........................", ".....##.........................", ".....##.........................", ".....##.........................", ".....##.........................", ".....##.........................", "................................", "................................", "................................", "................................"}; --- NEW FILE: pcb_pad_tool.xpm --- /* XPM */ static const char *pcb_pad_tool[]={ "32 32 2 1", ". c None", "# c #c00000", "................................", ".....####..#####.####...........", ".....#...#.#...#.#...#..........", ".....#...#.#...#.#...#..........", ".....####..#####.#...#..........", ".....#.....#...#.#...#..........", ".....#.....#...#.####...........", "................................", "................................", "................................", "................................", "................................", "................................", "................................", "..............#####.............", ".............#######............", "............#########...........", "...........###########..........", "..........#############.........", "..........#############.........", "..........#############.........", "..........#############.........", "..........#############.........", "...........###########..........", "............#########...........", ".............#######............", "..............#####.............", "................................", "................................", "................................", "................................", "................................"}; |
From: Ricky W. <ri...@us...> - 2006-08-26 13:21:36
|
Update of /cvsroot/reds/rapideds/src/ui/cadlib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28791/src/ui/cadlib Modified Files: Makefile.am Added Files: browse_lib_form.ui Log Message: Initial PCB framework --- NEW FILE: browse_lib_form.ui --- <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>BrowseLibForm</class> <widget class="QDialog"> <property name="name"> <cstring>BrowseLibForm</cstring> </property> <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>555</width> <height>469</height> </rect> </property> <property name="caption"> <string>Library Browser</string> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> <widget class="QLayoutWidget" row="2" column="1"> <property name="name"> <cstring>layout7</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> <widget class="QLayoutWidget"> <property name="name"> <cstring>layout4</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> <widget class="QLayoutWidget"> <property name="name"> <cstring>layout8</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> <widget class="QLabel"> <property name="name"> <cstring>TextLabel2</cstring> </property> <property name="sizePolicy"> <sizepolicy> <hsizetype>5</hsizetype> <vsizetype>0</vsizetype> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> <property name="text"> <string>Preview</string> </property> </widget> <spacer> <property name="name"> <cstring>spacer4_2</cstring> </property> <property name="orientation"> <enum>Horizontal</enum> </property> <property name="sizeType"> <enum>Expanding</enum> </property> <property name="sizeHint"> <size> <width>133</width> <height>20</height> </size> </property> </spacer> </hbox> </widget> <widget class="QLabel"> <property name="name"> <cstring>preview_PXM</cstring> </property> <property name="sizePolicy"> <sizepolicy> <hsizetype>3</hsizetype> <vsizetype>3</vsizetype> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> <property name="minimumSize"> <size> <width>200</width> <height>200</height> </size> </property> <property name="paletteBackgroundColor"> <color> <red>255</red> <green>255</green> <blue>255</blue> </color> </property> <property name="cursor"> <cursor>0</cursor> </property> <property name="frameShape"> <enum>Box</enum> </property> <property name="frameShadow"> <enum>Sunken</enum> </property> <property name="lineWidth"> <number>1</number> </property> <property name="scaledContents"> <bool>true</bool> </property> <property name="alignment"> <set>AlignCenter</set> </property> </widget> </vbox> </widget> <widget class="QLayoutWidget"> <property name="name"> <cstring>layout6</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> <widget class="KPushButton"> <property name="name"> <cstring>cancel_PB</cstring> </property> <property name="text"> <string>&Close</string> </property> <property name="accel"> <string>Alt+C</string> </property> </widget> <spacer> <property name="name"> <cstring>Spacer1</cstring> </property> <property name="orientation"> <enum>Vertical</enum> </property> <property name="sizeType"> <enum>MinimumExpanding</enum> </property> <property name="sizeHint"> <size> <width>20</width> <height>44</height> </size> </property> </spacer> <widget class="KPushButton"> <property name="name"> <cstring>configSources_PB</cstring> </property> <property name="enabled"> <bool>false</bool> </property> <property name="text"> <string>Config Sources</string> </property> <property name="toolTip" stdset="0"> <string>Configure database sources</string> </property> </widget> </vbox> </widget> </hbox> </widget> <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>layout8</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> <widget class="KHistoryCombo"> <property name="name"> <cstring>searchStr_LE</cstring> </property> <property name="sizePolicy"> <sizepolicy> <hsizetype>3</hsizetype> <vsizetype>0</vsizetype> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> </widget> <widget class="KPushButton"> <property name="name"> <cstring>searchPB</cstring> </property> <property name="text"> <string>&Search</string> </property> <property name="accel"> <string>Alt+S</string> </property> </widget> </hbox> </widget> <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>layout6</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> <widget class="QLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> <property name="text"> <string>Object Type</string> </property> </widget> <widget class="KComboBox"> <property name="name"> <cstring>objType_CB</cstring> </property> </widget> <spacer> <property name="name"> <cstring>spacer3</cstring> </property> <property name="orientation"> <enum>Horizontal</enum> </property> <property name="sizeType"> <enum>Expanding</enum> </property> <property name="sizeHint"> <size> <width>40</width> <height>20</height> </size> </property> </spacer> </hbox> </widget> <widget class="LibBrowseTree" row="2" column="0" rowspan="2" colspan="1"> <column> <property name="text"> <string>Footprints</string> </property> <property name="clickable"> <bool>true</bool> </property> <property name="resizable"> <bool>true</bool> </property> </column> <property name="name"> <cstring>tree_LV</cstring> </property> <property name="minimumSize"> <size> <width>100</width> <height>0</height> </size> </property> </widget> <widget class="QTable" row="3" column="1"> <column> <property name="text"> <string>Value</string> </property> </column> <row> <property name="text"> <string>Name</string> </property> <property name="pixmap"> <pixmap>image0</pixmap> </property> </row> <row> <property name="text"> <string>Description</string> </property> </row> <row> <property name="text"> <string>Group</string> </property> </row> <row> <property name="text"> <string>DBSource</string> </property> </row> <property name="name"> <cstring>properties_TB</cstring> </property> <property name="frameShape"> <enum>StyledPanel</enum> </property> <property name="frameShadow"> <enum>Sunken</enum> </property> <property name="numRows"> <number>4</number> </property> <property name="numCols"> <number>1</number> </property> <property name="showGrid"> <bool>true</bool> </property> <property name="rowMovingEnabled"> <bool>false</bool> </property> <property name="readOnly"> <bool>true</bool> </property> <property name="selectionMode"> <enum>NoSelection</enum> </property> <property name="focusStyle"> <enum>SpreadSheet</enum> </property> </widget> </grid> </widget> <images> <image name="image0"> <data format="PNG" length="215">89504e470d0a1a0a0000000d4948445200000020000000200806000000737a7af40000009e494441545885ed97e10a80200c8467f452f3fdd91ecb7e89125a9bc634d8f7abc06e97d705062282951c4ba703c0a9598c1893641d3385690318cb30a62298c51163ea5dbf69d43423a81f6cdd4b906aa822a861a690df56b3e59f19981d9c694670cfab97df13528dee0e8c0c1dd150b740c32f5ab0fc4fb8a7016f0180b7c08e3d0d780b00bc0576ec69c0b205417332323d17cc0a4bd9f31b7003965c20f991f0ff74f37a0000000049454e44ae426082</data> </image> </images> <connections> <connection> <sender>cancel_PB</sender> <signal>clicked()</signal> <receiver>BrowseLibForm</receiver> <slot>close()</slot> </connection> <connection> <sender>searchPB</sender> <signal>clicked()</signal> <receiver>tree_LV</receiver> <slot>searchSlot()</slot> </connection> <connection> <sender>searchStr_LE</sender> <signal>textChanged(const QString & )</signal> <receiver>tree_LV</receiver> <slot>setSearchQuerySlot(const QString&)</slot> </connection> <connection> <sender>tree_LV</sender> <signal>previewImage(const QPixmap & )</signal> <receiver>preview_PXM</receiver> <slot>setPixmap(const QPixmap&)</slot> </connection> </connections> <includes> <include location="local" impldecl="in declaration">libbrowsetree.h</include> </includes> <slots> <slot>searchSlot()</slot> </slots> <layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kcombobox.h</includehint> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kcombobox.h</includehint> </includehints> </UI> Index: Makefile.am =================================================================== RCS file: /cvsroot/reds/rapideds/src/ui/cadlib/Makefile.am,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile.am 12 Dec 2004 11:25:09 -0000 1.1.1.1 --- Makefile.am 26 Aug 2006 13:21:32 -0000 1.2 *************** *** 1,5 **** ! INCLUDES = -I$(top_srcdir)/src/common $(all_includes) METASOURCES = AUTO libui_cadlib_la_LDFLAGS = $(all_libraries) noinst_LTLIBRARIES = libui-cadlib.la ! libui_cadlib_la_SOURCES = sources.ui placeholder.cpp --- 1,7 ---- ! INCLUDES = -I$(top_srcdir)/src/cadlib/core -I$(top_srcdir)/src/cadlib/gui \ ! -I$(top_srcdir)/src/common $(all_includes) METASOURCES = AUTO libui_cadlib_la_LDFLAGS = $(all_libraries) noinst_LTLIBRARIES = libui-cadlib.la ! libui_cadlib_la_SOURCES = sources.ui placeholder.cpp browse_lib_form.ui ! |
From: Ricky W. <ri...@us...> - 2006-08-26 13:21:36
|
Update of /cvsroot/reds/rapideds/src/ui/pcb In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28791/src/ui/pcb Added Files: Makefile.am footprint_browse_form.ui layer_edit_form.ui placeholder.cpp Log Message: Initial PCB framework --- NEW FILE: footprint_browse_form.ui --- <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>FootprintBrowseForm</class> <widget class="QDialog"> <property name="name"> <cstring>FootprintBrowseForm</cstring> </property> <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>544</width> <height>486</height> </rect> </property> <property name="caption"> <string>Footprint Browser</string> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> <widget class="LibBrowseTree" row="1" column="0" rowspan="2" colspan="1"> <column> <property name="text"> <string>Footprints</string> </property> <property name="clickable"> <bool>true</bool> </property> <property name="resizable"> <bool>true</bool> </property> </column> <property name="name"> <cstring>tree_LV</cstring> </property> <property name="minimumSize"> <size> <width>100</width> <height>0</height> </size> </property> </widget> <widget class="QTable" row="2" column="1"> <column> <property name="text"> <string>Value</string> </property> </column> <row> <property name="text"> <string>Name</string> </property> <property name="pixmap"> <pixmap>image0</pixmap> </property> </row> <row> <property name="text"> <string>Description</string> </property> </row> <row> <property name="text"> <string>Group</string> </property> </row> <row> <property name="text"> <string>DBSource</string> </property> </row> <property name="name"> <cstring>footprintProperties_TB</cstring> </property> <property name="frameShape"> <enum>StyledPanel</enum> </property> <property name="frameShadow"> <enum>Sunken</enum> </property> <property name="numRows"> <number>4</number> </property> <property name="numCols"> <number>1</number> </property> <property name="showGrid"> <bool>true</bool> </property> <property name="rowMovingEnabled"> <bool>false</bool> </property> <property name="readOnly"> <bool>true</bool> </property> <property name="selectionMode"> <enum>NoSelection</enum> </property> <property name="focusStyle"> <enum>SpreadSheet</enum> </property> </widget> <widget class="QLayoutWidget" row="1" column="1"> <property name="name"> <cstring>layout7</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> <widget class="QLayoutWidget"> <property name="name"> <cstring>layout4</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> <widget class="QLayoutWidget"> <property name="name"> <cstring>layout8</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> <widget class="QLabel"> <property name="name"> <cstring>TextLabel2</cstring> </property> <property name="sizePolicy"> <sizepolicy> <hsizetype>5</hsizetype> <vsizetype>0</vsizetype> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> <property name="text"> <string>Preview</string> </property> </widget> <spacer> <property name="name"> <cstring>spacer4_2</cstring> </property> <property name="orientation"> <enum>Horizontal</enum> </property> <property name="sizeType"> <enum>Expanding</enum> </property> <property name="sizeHint"> <size> <width>133</width> <height>20</height> </size> </property> </spacer> </hbox> </widget> <widget class="QLabel"> <property name="name"> <cstring>preview_PXM</cstring> </property> <property name="sizePolicy"> <sizepolicy> <hsizetype>3</hsizetype> <vsizetype>3</vsizetype> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> <property name="minimumSize"> <size> <width>200</width> <height>200</height> </size> </property> <property name="paletteBackgroundColor"> <color> <red>255</red> <green>255</green> <blue>255</blue> </color> </property> <property name="cursor"> <cursor>0</cursor> </property> <property name="frameShape"> <enum>Box</enum> </property> <property name="frameShadow"> <enum>Sunken</enum> </property> <property name="lineWidth"> <number>1</number> </property> <property name="scaledContents"> <bool>true</bool> </property> <property name="alignment"> <set>AlignCenter</set> </property> </widget> </vbox> </widget> <widget class="QLayoutWidget"> <property name="name"> <cstring>layout6</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> <widget class="KPushButton"> <property name="name"> <cstring>place_PB</cstring> </property> <property name="text"> <string>&Place</string> </property> <property name="accel"> <string>Alt+P</string> </property> </widget> <widget class="KPushButton"> <property name="name"> <cstring>cancel_PB</cstring> </property> <property name="text"> <string>&Close</string> </property> <property name="accel"> <string>Alt+C</string> </property> </widget> <spacer> <property name="name"> <cstring>Spacer1</cstring> </property> <property name="orientation"> <enum>Vertical</enum> </property> <property name="sizeType"> <enum>MinimumExpanding</enum> </property> <property name="sizeHint"> <size> <width>20</width> <height>44</height> </size> </property> </spacer> <widget class="KPushButton"> <property name="name"> <cstring>configSources_PB</cstring> </property> <property name="text"> <string>Config Sources</string> </property> <property name="toolTip" stdset="0"> <string>Configure database sources</string> </property> </widget> </vbox> </widget> </hbox> </widget> <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>layout8</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> <widget class="KHistoryCombo"> <property name="name"> <cstring>searchStr_LE</cstring> </property> <property name="sizePolicy"> <sizepolicy> <hsizetype>3</hsizetype> <vsizetype>0</vsizetype> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> </widget> <widget class="KPushButton"> <property name="name"> <cstring>searchPB</cstring> </property> <property name="text"> <string>&Search</string> </property> <property name="accel"> <string>Alt+S</string> </property> </widget> </hbox> </widget> </grid> </widget> <images> <image name="image0"> <data format="PNG" length="215">89504e470d0a1a0a0000000d4948445200000020000000200806000000737a7af40000009e494441545885ed97e10a80200c8467f452f3fdd91ecb7e89125a9bc634d8f7abc06e97d705062282951c4ba703c0a9598c1893641d3385690318cb30a62298c51163ea5dbf69d43423a81f6cdd4b906aa822a861a690df56b3e59f19981d9c694670cfab97df13528dee0e8c0c1dd150b740c32f5ab0fc4fb8a7016f0180b7c08e3d0d780b00bc0576ec69c0b205417332323d17cc0a4bd9f31b7003965c20f991f0ff74f37a0000000049454e44ae426082</data> </image> </images> <connections> <connection> <sender>cancel_PB</sender> <signal>clicked()</signal> <receiver>FootprintBrowseForm</receiver> <slot>close()</slot> </connection> <connection> <sender>place_PB</sender> <signal>clicked()</signal> <receiver>FootprintBrowseForm</receiver> <slot>accept()</slot> </connection> <connection> <sender>searchPB</sender> <signal>clicked()</signal> <receiver>tree_LV</receiver> <slot>searchSlot()</slot> </connection> <connection> <sender>searchStr_LE</sender> <signal>textChanged(const QString & )</signal> <receiver>tree_LV</receiver> <slot>setSearchQuerySlot(const QString & )</slot> </connection> <connection> <sender>tree_LV</sender> <signal>previewImage(const QPixmap & )</signal> <receiver>preview_PXM</receiver> <slot>setPixmap(const QPixmap & )</slot> </connection> </connections> <slots> <slot>searchSlot()</slot> </slots> <layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kcombobox.h</includehint> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> </includehints> <includes> <include location="local" impldecl="in declaration">libbrowsetree.h</include> </includes> </UI> --- NEW FILE: Makefile.am --- INCLUDES = -I$(top_srcdir)/src/cadlib/core -I$(top_srcdir)/src/cadlib/gui \ -I$(top_srcdir)/src/common -I$(top_srcdir)/src/pcbedit $(all_includes) METASOURCES = AUTO lib_LTLIBRARIES = libpcb_ui.la libpcb_ui_la_LDFLAGS = $(all_libraries) libpcb_ui_la_SOURCES = placeholder.cpp layer_edit_form.ui \ footprint_browse_form.ui noinst_HEADERS = footprint_browse_form.h --- NEW FILE: placeholder.cpp --- // file : placeholder.cpp // Descr : This file is here just to force the automake scripts to build // : the libtool library with only ui files in it. // Author : Ricky White ( ri...@ne... ) // License : GNU General Public License // Coyright : Copyright (C) Ricky White 2004 /////////////////////////////////////////////////////////////////////////////// --- NEW FILE: layer_edit_form.ui --- <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>LayerEditForm</class> <widget class="QDialog"> <property name="name"> <cstring>LayerEditForm</cstring> </property> <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>501</width> <height>225</height> </rect> </property> <property name="sizePolicy"> <sizepolicy> <hsizetype>3</hsizetype> <vsizetype>5</vsizetype> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> <property name="caption"> <string>Layer Editor</string> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> <widget class="KListView" row="0" column="0" rowspan="3" colspan="1"> <column> <property name="text"> <string>Name</string> </property> <property name="clickable"> <bool>true</bool> </property> <property name="resizable"> <bool>true</bool> </property> </column> <column> <property name="text"> <string>Type</string> </property> <property name="clickable"> <bool>true</bool> </property> <property name="resizable"> <bool>true</bool> </property> </column> <column> <property name="text"> <string>Stack Position</string> </property> <property name="clickable"> <bool>true</bool> </property> <property name="resizable"> <bool>true</bool> </property> </column> <column> <property name="text"> <string>Colour</string> </property> <property name="clickable"> <bool>true</bool> </property> <property name="resizable"> <bool>true</bool> </property> </column> <column> <property name="text"> <string>Visible</string> </property> <property name="clickable"> <bool>true</bool> </property> <property name="resizable"> <bool>true</bool> </property> </column> <column> <property name="text"> <string>Description</string> </property> <property name="clickable"> <bool>true</bool> </property> <property name="resizable"> <bool>true</bool> </property> </column> <property name="name"> <cstring>kListView1</cstring> </property> </widget> <widget class="KPushButton" row="0" column="1"> <property name="name"> <cstring>kPushButton4</cstring> </property> <property name="text"> <string>&Add Layer</string> </property> <property name="accel"> <string>Alt+A</string> </property> </widget> <widget class="KPushButton" row="1" column="1"> <property name="name"> <cstring>kPushButton5</cstring> </property> <property name="text"> <string>&Delete Layer</string> </property> <property name="accel"> <string>Alt+D</string> </property> </widget> <spacer row="2" column="1"> <property name="name"> <cstring>spacer3</cstring> </property> <property name="orientation"> <enum>Vertical</enum> </property> <property name="sizeType"> <enum>Expanding</enum> </property> <property name="sizeHint"> <size> <width>20</width> <height>40</height> </size> </property> </spacer> <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>layout6</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> <spacer> <property name="name"> <cstring>spacer2</cstring> </property> <property name="orientation"> <enum>Horizontal</enum> </property> <property name="sizeType"> <enum>Expanding</enum> </property> <property name="sizeHint"> <size> <width>61</width> <height>20</height> </size> </property> </spacer> <widget class="KPushButton"> <property name="name"> <cstring>kPushButton1</cstring> </property> <property name="text"> <string>&Ok</string> </property> <property name="accel"> <string>Alt+O</string> </property> </widget> <widget class="KPushButton"> <property name="name"> <cstring>kPushButton2</cstring> </property> <property name="text"> <string>&Cancel</string> </property> <property name="accel"> <string>Alt+C</string> </property> </widget> <spacer> <property name="name"> <cstring>spacer1</cstring> </property> <property name="orientation"> <enum>Horizontal</enum> </property> <property name="sizeType"> <enum>Expanding</enum> </property> <property name="sizeHint"> <size> <width>61</width> <height>20</height> </size> </property> </spacer> <widget class="KPushButton"> <property name="name"> <cstring>kPushButton3</cstring> </property> <property name="text"> <string>&Help</string> </property> <property name="accel"> <string>Alt+H</string> </property> </widget> </hbox> </widget> </grid> </widget> <connections> <connection> <sender>kPushButton1</sender> <signal>clicked()</signal> <receiver>LayerEditForm</receiver> <slot>accept()</slot> </connection> <connection> <sender>kPushButton2</sender> <signal>clicked()</signal> <receiver>LayerEditForm</receiver> <slot>reject()</slot> </connection> </connections> <slots> <slot>helpSlot()</slot> </slots> <layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> </includehints> </UI> |
From: Ricky W. <ri...@us...> - 2006-08-26 13:21:35
|
Update of /cvsroot/reds/rapideds/src/pcbedit/pcbtool In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28791/src/pcbedit/pcbtool Added Files: Makefile.am footprintbrowsedlg.cpp footprintbrowsedlg.h pt_footprint.cpp pt_footprint.h pt_layerselector.cpp pt_layerselector.h pt_pad.cpp pt_pad.h pt_selection.cpp pt_selection.h pt_track.cpp pt_track.h st_selection.moc.cpp Log Message: Initial PCB framework --- NEW FILE: footprintbrowsedlg.h --- // file : footprintbrowsedlg.h // Descr : Dialog tobrowse / choose a footprint. // Author : Ricky White ( ri...@ne... ) // License : GNU GPL General Public License // Copyright : Copyright (C) Ricky White 2004 /////////////////////////////////////////////////////////////////////////////// #ifndef FOOTPRINTBROWSEDLG_H #define FOOTPRINTBROWSEDLG_H #include <kconfig.h> #include "footprint_browse_form.h" /** DIalog to broswe and choose a footprint @author Ricky White <ri...@ne...> */ class FootprintBrowseDlg : public FootprintBrowseForm { Q_OBJECT; public: FootprintBrowseDlg(); ~FootprintBrowseDlg(); public slots: void setCurName( QString name ); void setCurDescr( QString descr ); void setCurPath( QString path ); protected: KConfig *m_cfg; }; #endif --- NEW FILE: pt_pad.cpp --- // file : pt_pad.cpp // Descr : PCB Pad placment tool // Author : Ricky White ( ri...@ne... ) // License : GNU GPL General Public License // Copyright : Copyright (C) Ricky White 2004 /////////////////////////////////////////////////////////////////////////////// #include <qiconset.h> #include <klocale.h> #include <qcanvas.h> #include "../pcbedit.h" #include "pt_pad.h" #include "../../images/pcb_pad_tool.xpm" PT_Pad::PT_Pad(QCanvasView *view, PrjDoc &prj ) : CadToolGL( view, prj ), m_pad(0) { m_view = view; m_action = new KAction("Place Pad",QIconSet(QPixmap(pcb_pad_tool)), 0, (PT_Pad*)this, SLOT(selectTool_slot()), ((PcbEdit*)m_view)->actionCollection(),"pcb_pad_tool"); setGrid( Units(1,Units::MM) ); } PT_Pad::~PT_Pad() { delete m_action; } /** Handle mouse movement when this tool is selected */ void PT_Pad::mouseMoveEvent( QMouseEvent *e ) { CadToolGL::mouseMoveEvent(e); if( m_pad ) m_pad->setPos( m_curPos ); } void PT_Pad::mousePressEvent( QMouseEvent *e ) { CadToolGL::mousePressEvent(e); if(e->button()==QMouseEvent::LeftButton) { // place a pad here emit setModified(); m_pad->setPos( m_curPos ); newObject(); } else if(e->button()==QMouseEvent::RightButton) { // abort current line m_pad->hide(); delete m_pad; m_pad = 0; m_view->canvas()->update(); // switch back to select tool static_cast<PcbEdit*>(m_view)->selectTool_slot(0); } } void PT_Pad::selected() { CadToolGL::selected(); emit statusBarMsg(i18n("Pad Tool : Click to place pad")); newObject(); } void PT_Pad::deselect() { CadToolGL::deselect(); delete m_pad; m_pad = 0; } void PT_Pad::newObject() { m_pad = new PO_Pad((PcbCanvas*)static_cast<PcbEdit*>(m_view)->canvas()); m_pad->setPos( m_curPos ); m_pad->show(); } --- NEW FILE: footprintbrowsedlg.cpp --- // file : .cpp // Descr : // Author : Ricky White ( ri...@ne... ) // License : GNU GPL General Public License // Copyright : Copyright (C) Ricky White 2004 /////////////////////////////////////////////////////////////////////////////// #include <qtable.h> #include <kdebug.h> #include <klistview.h> //#include "libbrowsetree.h" #include "footprintbrowsedlg.h" FootprintBrowseDlg::FootprintBrowseDlg() : FootprintBrowseForm() { QStringList list; m_cfg = new KConfig("rapidEDS/schematic.cfg",false,true,"config"); // initial options for Widgets footprintProperties_TB->setColumnWidth(0,285); tree_LV->setLibObjType( LibObject::FOOTPRINT ); connect( tree_LV, SIGNAL( curName(QString) ), SLOT( setCurName(QString) ) ); connect( tree_LV, SIGNAL( curDescr(QString) ), SLOT( setCurDescr(QString) ) ); connect( tree_LV, SIGNAL( curPath(QString) ), SLOT( setCurPath(QString) ) ); } FootprintBrowseDlg::~FootprintBrowseDlg() { } void FootprintBrowseDlg::setCurName( QString name ) { footprintProperties_TB->setText( 0, 0, name ); } void FootprintBrowseDlg::setCurDescr( QString descr ) { footprintProperties_TB->setText( 1, 0, descr ); } void FootprintBrowseDlg::setCurPath( QString path ) { footprintProperties_TB->setText( 3, 0, path ); } --- NEW FILE: pt_layerselector.h --- // file : .h // Descr : // Author : Ricky White ( ri...@ne... ) // License : GNU GPL General Public License // Copyright : Copyright (C) Ricky White 2004 /////////////////////////////////////////////////////////////////////////////// #ifndef PT_LAYERSELECTOR_H #define PT_LAYERSELECTOR_H #include "cadobj/cadobj.h" #include "cadtool/cadtoolgl.h" #include "../pcbobj/po_pad.h" /** Tool to allow selection of the current layer within the PCB editor. @author Ricky White <ri...@ne...> */ class PT_LayerSelector : public CadToolGL { Q_OBJECT; public: PT_LayerSelector(QCanvasView *view, PrjDoc &prj); virtual ~PT_LayerSelector(); virtual void mousePressEvent( QMouseEvent *e ); virtual void mouseMoveEvent( QMouseEvent *e ); virtual QString name() { return "PT_LayerSelector"; } virtual void selected(); virtual void deselect(); public slots: void editLayersSlot(); protected: KAction *m_editAct, *m_labelAct, *m_layerAct; }; #endif --- NEW FILE: pt_track.h --- // file : .h // Descr : // Author : Ricky White ( ri...@ne... ) // License : GNU GPL General Public License // Copyright : Copyright (C) Ricky White 2004 /////////////////////////////////////////////////////////////////////////////// #ifndef PT_TRACK_H #define PT_TRACK_H #include "cadobj/cadobj.h" #include "cadtool/cadtoolgl.h" #include "../pcbobj/po_track.h" /** PCB Track placment tool. @author Ricky White <ri...@ne...> */ class PT_Track : public CadToolGL { public: PT_Track(QCanvasView *view, PrjDoc &prj); virtual ~PT_Track(); virtual void mousePressEvent( QMouseEvent *e ); virtual void mouseMoveEvent( QMouseEvent *e ); virtual QString name() { return "PT_Track"; } virtual void selected(); virtual void deselect(); protected: virtual void newObject(); PO_Track *m_track; typedef enum { FIRST_PT, NEXT_PT, UNKNOWN } STATE; STATE m_state; }; #endif --- NEW FILE: pt_selection.h --- // file : st_selection.h // Descr : Schematic object selection tool // Author : Ricky White ( ri...@ne... ) // License : GNU General Public License // Coyright : Copyright (C) Ricky White 2004 /////////////////////////////////////////////////////////////////////////////// #ifndef ST_SELECTION_H #define ST_SELECTION_H #include "cadobj/rubberband.h" #include "cadobj/cadobj.h" #include "cadtool/cadtoolgl.h" #include <qstring.h> #include <qcanvas.h> // forward declarations class QPoint; /** @short Selection tool, handles object selection / dragging / properties etc * * @author Ricky White */ class PT_Selection : public CadToolGL { Q_OBJECT public: virtual ~PT_Selection(); PT_Selection( QCanvasView *view, PrjDoc &prj); virtual void selected(); virtual void deselect(); virtual void mousePressEvent( QMouseEvent *e ); virtual void mouseMoveEvent( QMouseEvent *e ); virtual void mouseReleaseEvent( QMouseEvent *e ); virtual void mouseDoubleClickEvent( QMouseEvent *e ); virtual QString name() { return "PT_selection"; } public slots: void menu_slot(int); protected: /** Copy the currently selected object(s) */ void copy(); void paste(); /** Delete the currently selected object(s) */ void deleteObjs(); /** list of currently selected objects */ QCanvasItemList m_selList; /** returns the first selectable item from the list * @param list List of QCanvasItems to search * @param parent if true the object must be a parent object otherwise * children can also be selected */ QCanvasItem *getFirstValid( QCanvasItemList &list, bool parent=false); /** Takes a list of objects and returns a list of those that are valid * CadObj's or SchObj'sand not special objects */ QCanvasItemList getValidList(QCanvasItemList ilist); void clearSelectionList(); /** Select the first valis item in the provided list * @param list List of QCanvasItems to select from * @param parent if true the object must be a parent object otherwise * children can also be selected * @returns success / failure */ bool selectFirstValid( QCanvasItemList &list, bool parent=false ); //////////////////////////////// // Copy / Paste functionality // //////////////////////////////// /** list of objects to past when a paste is chosen */ QCanvasItemList m_copyList; /** Location relative to selected objects that was selected */ QPoint m_copyPoint; /** Returns a copy of the supplied list with all child objects removed */ QCanvasItemList listStripChildren( QCanvasItemList &list ); //////////////////////// // Menu Functionality // //////////////////////// KPopupMenu *m_popup; /** Update the menu depending on the number of items selected */ void updateMenu(); int m_menuid_copy; int m_menuid_paste; int m_menuid_flipx; int m_menuid_flipy; int m_menuid_rotate; int m_menuid_delete; int m_menuid_properties; int m_menuid_rotateCW; int m_menuid_rotateCCW; UnitsPt m_prevPos; RubberBand *m_band; typedef enum { DST_NONE, DST_MOVING, DST_BAND } DragState; DragState m_dragState; }; #endif --- NEW FILE: pt_layerselector.cpp --- // file : pt_layerselector.cpp // Descr : Layer selection and edition support // Author : Ricky White ( ri...@ne... ) // License : GNU GPL General Public License // Copyright : Copyright (C) Ricky White 2004 /////////////////////////////////////////////////////////////////////////////// #include <qiconset.h> #include <klocale.h> #include <qcanvas.h> #include <kactionclasses.h> #include <ktoolbarlabelaction.h> #include <kcombobox.h> #include "../pcbedit.h" #include "pt_layerselector.h" #include "../../images/pcb_editlayers_tool.xpm" #include "../layereditdlg.h" PT_LayerSelector::PT_LayerSelector(QCanvasView *view, PrjDoc &prj ) : CadToolGL( view, prj ) { m_view = view; KHistoryCombo* findCombo = new KHistoryCombo(this); m_layerAct = new KWidgetAction(findCombo, i18n("F&ind Combo"), Qt::Key_F6, this, SLOT(slotFocus()), ((PcbEdit*)m_view)->actionCollection(), "layer_selector" ); m_labelAct = new KToolBarLabelAction(findCombo, i18n("&Layer"), 0, this, SLOT(slotFocus()), ((PcbEdit*)m_view)->actionCollection(), "select_layer_label"); m_editAct = new KAction("Edit Layers",QIconSet(QPixmap(pcb_editlayers_tool)), 0, static_cast<PT_LayerSelector*>(this), SLOT(editLayersSlot()), ((PcbEdit*)m_view)->actionCollection(),"layer_editor"); } PT_LayerSelector::~PT_LayerSelector() { delete m_action; } /** Handle mouse movement when this tool is selected */ void PT_LayerSelector::mouseMoveEvent( QMouseEvent *e ) { CadToolGL::mouseMoveEvent(e); } void PT_LayerSelector::mousePressEvent( QMouseEvent *e ) { CadToolGL::mousePressEvent(e); } void PT_LayerSelector::selected() { CadToolGL::selected(); } void PT_LayerSelector::deselect() { CadToolGL::deselect(); } /** Display the edit layers dialog. */ void PT_LayerSelector::editLayersSlot() { kdDebug()<<"****************** gotya ******************"<<endl; PcbCanvas *c = (PcbCanvas*)((PcbEdit*)m_view)->canvas(); LayerEditDlg dlg(*c); dlg.exec(); } --- NEW FILE: pt_selection.cpp --- // file : pt_selection.cpp // Descr : Schematic object selection tool // Author : Ricky White ( ri...@ne... ) // License : GNU General Public License // Coyright : Copyright (C) Ricky White 2004 /////////////////////////////////////////////////////////////////////////////// #include "pt_selection.h" #include "cadobj/canvascursor.h" #include <qcursor.h> #include <qevent.h> #include <qcanvas.h> #include <qwmatrix.h> #include <klocale.h> #include <kpopupmenu.h> #include <kaction.h> #include <kdebug.h> #include "cadobj/cadobj.h" #include "cadobj/rubberband.h" #include "../pcbobj/pcbobj.h" #include "../../images/selecttool.xpm" #include "../pcbedit.h" PT_Selection::~PT_Selection() { delete m_popup; } PT_Selection::PT_Selection( QCanvasView *view, PrjDoc &prj ) : CadToolGL( view, prj ) { m_action = new KAction("Select/Drag Object",QIconSet( QPixmap(selecttool) ), 0, (CadTool*)this, SLOT(selectTool_slot()), ((PcbEdit*)m_view)->actionCollection(),"selecttool"); m_dragState = DST_NONE; m_popup = new KPopupMenu(m_view,"selection_popup"); connect( m_popup, SIGNAL(activated(int)), SLOT(menu_slot(int)) ); updateMenu(); } void PT_Selection::selected() { CadToolGL::selected(); emit statusBarMsg( i18n("Click to select") ); m_band = new RubberBand(m_view->canvas()); } void PT_Selection::deselect() { delete m_band; CadToolGL::deselect(); clearSelectionList(); } void PT_Selection::mousePressEvent( QMouseEvent *e ) { CadToolGL::mousePressEvent(e); // Must call this for correct positioning QCanvasItemList::Iterator it; QCanvasItem *obj; QPoint pos = m_curPos.getQPoint(m_zoom); QCanvasItemList clst = getValidList(m_view->canvas()->collisions(pos)); emit setModified(); switch(e->button()) { case QMouseEvent::LeftButton: if( !clst.isEmpty() ) { // user clicked on somthing other than space if( (e->state()==QMouseEvent::ControlButton) ) { // multi-select // already selected? if( clst.first()->isSelected() ) { clst.first()->setSelected(false); m_selList.remove(m_selList.find(clst.first())); m_view->canvas()->update(); if(clst.count()==1) updateMenu(); } else selectFirstValid(clst); } else { // Single Select, no special keys down if(m_selList.count()<=1) { // change selected object clearSelectionList(); // Add to selection list first item that is a cadobj obj=getFirstValid(clst); if(obj) { obj->setSelected(true); m_selList.append(obj); } else // blank space clicked on { // clear the entire selList clearSelectionList(); } } else { // only drop if not clicking on a member of the group if( m_selList.find( getFirstValid(clst) )==m_selList.end() ) { // More than one object selected when spaced clicked on clearSelectionList(); selectFirstValid(clst); } } } } else { // blank space clicked on clearSelectionList(); // begin rubberband m_band->setPos(m_curPos); m_band->setSize( Units(0,Units::MM),Units(0,Units::MM) ); m_view->canvas()->update(); m_band->show(); m_dragState = DST_BAND; } break; case QMouseEvent::RightButton: // TODO: Handle menu here... if( m_selList.count()==0 ) { // popup, no objects selected // try for a selection if( selectFirstValid(clst,false) ) { // yes, there is an object there so select it and provide properties updateMenu(); m_popup->exec(QCursor::pos()); } } else if( m_selList.count()==1) { if( clst.count()>0 ) { // check its the same object if( clst.first()!=m_selList.first() ) { clearSelectionList(); // deselect old object selectFirstValid(clst); // swap selection to new object } updateMenu(); m_popup->exec(QCursor::pos()); // request for popup on single item } } else { if( m_selList.find( getFirstValid(clst) )!=m_selList.end() ) { // on a member of the selection list so display group popup kdDebug()<<"Multi-selection popup request : NOT FULLY IMPLEMENTED"<<endl; updateMenu(); m_popup->exec(QCursor::pos()); } else { // right click in open space // deselect everything // no popup for you! clearSelectionList(); } } break; default: kdDebug()<<"PT_Selection - Unhandled mouse operation"<<endl; } m_prevPos = m_curPos; updateMenu(); m_view->canvas()->update(); } void PT_Selection::mouseMoveEvent( QMouseEvent *e ) { CadToolGL::updateCursorPos(e); QCanvasItemList clst=m_view->canvas()->collisions(m_curPos.getQPoint(m_zoom) ); QCanvasItemList::Iterator it; if(e->state()==QMouseEvent::LeftButton) { if(!m_selList.isEmpty()) { m_dragState = DST_MOVING; for(it=m_selList.begin();it!=m_selList.end();it++) { if( CadObj::isCadObj(*it)||PcbObj::isPcbObj(*it) ) { // in multiple selection mode, we can only drag parent objects CadObj *obj = dynamic_cast<CadObj*>(*it); // if(obj->parent()==0) { obj->dragObject()->moveBy(m_curPos-m_prevPos); obj->dragObject()->update(); } } } } else { // rubberband m_dragState = DST_BAND; m_band->setSize( m_curPos.x()-m_band->pos().x(), m_curPos.y()-m_band->pos().y() ); m_band->show(); m_view->canvas()->update(); } } m_view->canvas()->update(); m_prevPos = m_curPos; } void PT_Selection::mouseReleaseEvent( QMouseEvent *e ) { if( e->state()==QMouseEvent::LeftButton ) { if(m_dragState==DST_BAND) { m_band->hide(); m_dragState = DST_NONE; // select all the items now QCanvasItemList lst = getValidList( m_view->canvas()->collisions(m_band->rect()) ); for( QCanvasItemList::iterator it=lst.begin();it!=lst.end();++it ) (*it)->setSelected(true); m_selList = lst; } m_dragState = DST_NONE; } m_view->canvas()->update(); } void PT_Selection::mouseDoubleClickEvent( QMouseEvent *e ) { kdDebug()<<"double click"<<endl; QCanvasItem *item; CadObj *obj; QCanvasItemList clst; switch(e->button()) { case QMouseEvent::LeftButton: // @FIXME: the getFirstValid and friends functions have a limitation that hurts us here. it is necessary to be able to select a child object when double clicked provided the parent isn't within the selection list. clst = getValidList(m_view->canvas()->collisions(e->pos())); item = getFirstValid( clst, false ); if( item && (CadObj::isCadObj(item)||PcbObj::isPcbObj(item)) ) { obj = dynamic_cast<CadObj*>(item); obj->properties( m_view ); } break; default: break; } } /** Update the menu depending on the number of items selected */ void PT_Selection::updateMenu() { QCanvasItem *item = m_selList.first(); switch(m_selList.count()) { case 0: m_popup->clear(); break; case 1: m_popup->clear(); if( CadObj::isCadObj(item)||PcbObj::isPcbObj(item) ) { CadObj &obj(*dynamic_cast<CadObj*>(item)); obj.addMenuItems(m_popup); if( obj.canRotate() ) { m_menuid_rotateCW = m_popup->insertItem(i18n("Rotate CW\tR")); m_menuid_rotateCCW = m_popup->insertItem(i18n("Rotate CCW\tL")); m_popup->setAccel(Key_R,m_menuid_rotateCW); m_popup->setAccel(Key_L,m_menuid_rotateCCW); } else if( obj.canRotateSimple() ) { m_menuid_rotateCW = m_popup->insertItem(i18n("Rotate\tR")); m_popup->setAccel(Key_R,m_menuid_rotateCW); } if( obj.canFlip() ) { m_menuid_flipx = m_popup->insertItem(i18n("Flip X\tX")); m_menuid_flipy = m_popup->insertItem(i18n("Flip Y\tY")); m_popup->setAccel(Key_X,m_menuid_flipx); m_popup->setAccel(Key_Y,m_menuid_flipy); } } m_popup->insertSeparator(); m_menuid_copy=m_popup->insertItem(i18n("Copy\tctrl-c")); m_menuid_paste=m_popup->insertItem(i18n("Paste\tctrl-v"), CTRL+Key_V); m_popup->setAccel(CTRL+Key_C,m_menuid_copy); m_popup->setAccel(CTRL+Key_V,m_menuid_paste); m_popup->insertSeparator(); m_menuid_delete=m_popup->insertItem(i18n("Delete\tDel")); m_popup->setAccel(Key_Delete,m_menuid_delete); m_menuid_properties=m_popup->insertItem(i18n("Properties\tP")); m_popup->setAccel(Key_P,m_menuid_properties); m_popup->setItemEnabled(m_menuid_copy,true); m_popup->setItemEnabled(m_menuid_delete,true); m_popup->setItemEnabled(m_menuid_properties,true); break; default: // more than 1 m_selList = listStripChildren( m_selList ); if(m_selList.count()==0) updateMenu(); m_popup->clear(); m_popup->insertTitle(i18n("Multiple selection (%1)") .arg(m_selList.count())); m_popup->setItemEnabled(m_menuid_copy,true); m_menuid_delete=m_popup->insertItem(i18n("Delete\tDel")); m_popup->setAccel(Key_Delete,m_menuid_delete); m_popup->setItemEnabled(m_menuid_properties,false); break; } // switch // Show/hide paste option as necessary if(m_copyList.count()>=1) m_popup->setItemEnabled(m_menuid_paste,true); else m_popup->setItemEnabled(m_menuid_paste,false); } /** Delete the currently selected object(s) */ void PT_Selection::deleteObjs() { QCanvasItemList::Iterator it; for(it=m_selList.begin();it!=m_selList.end();it++) { if( CadObj::isCadObj(*it)||PcbObj::isPcbObj(*it) ) dynamic_cast<CadObj*>(*it)->abandon(); // release persistant resources (*it)->setSelected(false); (*it)->hide(); (*it)->setCanvas(0); delete (*it); } m_selList.clear(); m_view->canvas()->update(); } /** Copy the currently selected object(s) */ void PT_Selection::copy() { m_copyList = m_selList; // m_copyPoint = pt; // fixme, this needs to be trnslated to be ralative to the actual objects selected. kdDebug()<<"PT_Selection : copy(), "<<m_copyList.count() <<" objects copied"<<endl; RubberBand *band = new RubberBand(m_view->canvas()); band->setPos( Units(10,Units::MM),Units(10,Units::MM) ); band->setSize( Units(50,Units::MM),Units(100,Units::MM) ); band->show(); } void PT_Selection::paste() { kdDebug()<<"void PT_Selection::paste()"<<endl; } /////////////////////////////////////////////////////////////////////////////// // Protected functions // /////////////////////////////////////////////////////////////////////////////// /** returns the first sleectable item from the list */ QCanvasItem *PT_Selection::getFirstValid( QCanvasItemList &list, bool parent) { QCanvasItemList::Iterator it; for(it=list.begin();it!=list.end();it++) { if( CadObj::isCadObj(*it)||PcbObj::isPcbObj(*it) ) { if( !parent || (dynamic_cast<CadObj*>(*it)->parent()==0) ) return (*it); } } return 0; // no valid objects found } bool PT_Selection::selectFirstValid( QCanvasItemList &list, bool parent ) { QCanvasItem *obj = getFirstValid( list, parent ); if(obj!=0) { // if already in list remove and deselect if( m_selList.find(obj)!=m_selList.end() ) { // already in list! if( CadObj::isCadObj(obj)||PcbObj::isPcbObj(obj) ) obj->setSelected(false); m_selList.remove(obj); return false; } obj->setSelected(true); m_selList.append(obj); m_view->canvas()->update(); // show object selected return true; } else return false; } QCanvasItemList PT_Selection::getValidList(QCanvasItemList ilist) { QCanvasItemList olist; QCanvasItemList::Iterator it; for( it=ilist.begin(); it!=ilist.end(); it++ ) { if( CadObj::isCadObj(*it)||PcbObj::isPcbObj(*it) ) olist+=(*it); } return olist; } /** Returns a copy of the supplied list with all child objects removed */ QCanvasItemList PT_Selection::listStripChildren( QCanvasItemList &list ) { QCanvasItemList olist; QCanvasItemList::Iterator it; for( it=list.begin(); it!=list.end(); it++ ) { if( CadObj::isCadObj(*it)||PcbObj::isPcbObj(*it) ) { if( dynamic_cast<CadObj*>(*it)->parent()==0 ) olist.push_back(*it); } } return olist; } void PT_Selection::clearSelectionList() { kdDebug()<<"void PT_Selection::clearSelectionList()"<<endl; QCanvasItemList::Iterator it; for(it=m_selList.begin();it!=m_selList.end();it++) { (*it)->setSelected(false); } m_selList.clear(); m_view->canvas()->update(); } void PT_Selection::menu_slot( int id ) { kdDebug()<<"void PT_Selection::menu_slot()"<<endl; QCanvasItem *item = getFirstValid(m_selList); if( item && (CadObj::isCadObj(item)||PcbObj::isPcbObj(item)) ) { CadObj &obj(*dynamic_cast<CadObj*>(item)); if( id==m_menuid_copy ) copy(); else if( id==m_menuid_paste ) paste(); else if( id==m_menuid_flipx ) obj.flipX(); else if( id==m_menuid_flipy ) obj.flipY(); else if( id==m_menuid_rotateCW ) obj.rotateCW(); else if( id==m_menuid_rotateCCW ) obj.rotateCCW(); else if( id==m_menuid_properties ) { dynamic_cast<CadObj*>(item)->properties(m_view); dynamic_cast<CadObj*>(item)->update(); m_view->canvas()->update(); } else if( id==m_menuid_delete ) deleteObjs(); else obj.doMenuAction(id); } m_view->setFocus(); } --- NEW FILE: pt_pad.h --- // file : pt_pad.h // Descr : PCB Pad placment tool // Author : Ricky White ( ri...@ne... ) // License : GNU GPL General Public License // Copyright : Copyright (C) Ricky White 2004 /////////////////////////////////////////////////////////////////////////////// #ifndef PT_PAD_H #define PT_PAD_H #include "cadobj/cadobj.h" #include "cadtool/cadtoolgl.h" #include "../pcbobj/po_pad.h" /** Place a pad on a PCB. @author Ricky White <ri...@ne...> */ class PT_Pad : public CadToolGL { public: PT_Pad(QCanvasView *view, PrjDoc &prj); virtual ~PT_Pad(); virtual void mousePressEvent( QMouseEvent *e ); virtual void mouseMoveEvent( QMouseEvent *e ); virtual QString name() { return "PT_Pad"; } virtual void selected(); virtual void deselect(); protected: virtual void newObject(); PO_Pad *m_pad; }; #endif --- NEW FILE: pt_footprint.cpp --- // file : pt_footprint.cpp // Descr : Place a component foorprint on the PCB // Author : Ricky White ( ri...@ne... ) // License : GNU GPL General Public License // Copyright : Copyright (C) Ricky White 2006 /////////////////////////////////////////////////////////////////////////////// #include "pt_footprint.h" #include <qiconset.h> #include <klocale.h> #include <qcanvas.h> #include <kcombobox.h> #include <kactionclasses.h> #include <ktoolbarlabelaction.h> #include "../pcbedit.h" #include "pt_footprint.h" #include "footprintbrowsedlg.h" #include "../../images/pcb_footprint_tool.xpm" PT_Footprint::PT_Footprint(QCanvasView *view, PrjDoc &prj ) : CadToolGL( view, prj ), m_pad(0) { m_view = view; //m_action = // new KAction("Place Footprint",QIconSet(QPixmap(pcb_footprint_tool)), // 0, (PT_Footprint*)this, SLOT(selectTool_slot()), // ((PcbEdit*)m_view)->actionCollection(),"pcb_footprint_tool"); #if 0 KComboAction *recent = new KComboAction( "Recent Footprints", 0, this, SLOT(selectTool_slot()), /// @FIXME put correct slot here ((PcbEdit*)m_view)->actionCollection(), "recent_footprints" ); #endif KHistoryCombo* m_footprintCombo = new KHistoryCombo(this); m_recentAct = new KWidgetAction(m_footprintCombo, i18n("Footprint Combo"), Qt::Key_F6, this, SLOT(slotFocus()), ((PcbEdit*)m_view)->actionCollection(), "recent_footprints" ); m_labelAct = new KToolBarLabelAction(m_footprintCombo, i18n("&Footprint"), 0, this, SLOT(slotFocus()), ((PcbEdit*)m_view)->actionCollection(), "footprint_combo_label"); m_searchAct = new KAction("Search Footprints", QIconSet(QPixmap(pcb_footprint_tool)), 0, this, SLOT(browseFootprints_slot()), ((PcbEdit*)m_view)->actionCollection(),"search_footprints"); } PT_Footprint::~PT_Footprint() { delete m_action; } /** Handle mouse movement when this tool is selected */ void PT_Footprint::mouseMoveEvent( QMouseEvent *e ) { CadToolGL::mouseMoveEvent(e); if( m_pad ) m_pad->setPos( m_curPos ); } void PT_Footprint::mousePressEvent( QMouseEvent *e ) { CadToolGL::mousePressEvent(e); if(e->button()==QMouseEvent::LeftButton) { // place a pad here emit setModified(); m_pad->setPos( m_curPos ); newObject(); } else if(e->button()==QMouseEvent::RightButton) { // abort current line m_pad->hide(); delete m_pad; m_pad = 0; m_view->canvas()->update(); // switch back to select tool static_cast<PcbEdit*>(m_view)->selectTool_slot(0); } } void PT_Footprint::selected() { CadToolGL::selected(); emit statusBarMsg(i18n("Pad Tool : Click to place pad")); newObject(); } void PT_Footprint::deselect() { CadToolGL::deselect(); delete m_pad; m_pad = 0; } void PT_Footprint::newObject() { m_pad = new PO_Pad((PcbCanvas*)static_cast<PcbEdit*>(m_view)->canvas()); m_pad->setPos( m_curPos ); m_pad->show(); } /** Display a dialog to allow browsing ./ choosing a footprint to place. */ void PT_Footprint::browseFootprints_slot() { FootprintBrowseDlg dlg; dlg.exec(); } --- NEW FILE: st_selection.moc.cpp --- /**************************************************************************** ** ST_Selection meta object code from reading C++ file 'st_selection.h' ** ** Created: Sat Jul 29 16:50:34 2006 ** by: The Qt MOC ($Id: st_selection.moc.cpp,v 1.1 2006/08/26 13:21:31 rickyw Exp $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ #undef QT_NO_COMPAT #include "st_selection.h" #include <qmetaobject.h> #include <qapplication.h> #include <private/qucomextra_p.h> #if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) #error "This file was generated using the moc from 3.3.4. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif const char *ST_Selection::className() const { return "ST_Selection"; } QMetaObject *ST_Selection::metaObj = 0; static QMetaObjectCleanUp cleanUp_ST_Selection( "ST_Selection", &ST_Selection::staticMetaObject ); #ifndef QT_NO_TRANSLATION QString ST_Selection::tr( const char *s, const char *c ) { if ( qApp ) return qApp->translate( "ST_Selection", s, c, QApplication::DefaultCodec ); else return QString::fromLatin1( s ); } #ifndef QT_NO_TRANSLATION_UTF8 QString ST_Selection::trUtf8( const char *s, const char *c ) { if ( qApp ) return qApp->translate( "ST_Selection", s, c, QApplication::UnicodeUTF8 ); else return QString::fromUtf8( s ); } #endif // QT_NO_TRANSLATION_UTF8 #endif // QT_NO_TRANSLATION QMetaObject* ST_Selection::staticMetaObject() { if ( metaObj ) return metaObj; QMetaObject* parentObject = CadToolGL::staticMetaObject(); static const QUParameter param_slot_0[] = { { 0, &static_QUType_int, 0, QUParameter::In } }; static const QUMethod slot_0 = {"menu_slot", 1, param_slot_0 }; static const QMetaData slot_tbl[] = { { "menu_slot(int)", &slot_0, QMetaData::Public } }; metaObj = QMetaObject::new_metaobject( "ST_Selection", parentObject, slot_tbl, 1, 0, 0, #ifndef QT_NO_PROPERTIES 0, 0, 0, 0, #endif // QT_NO_PROPERTIES 0, 0 ); cleanUp_ST_Selection.setMetaObject( metaObj ); return metaObj; } void* ST_Selection::qt_cast( const char* clname ) { if ( !qstrcmp( clname, "ST_Selection" ) ) return this; return CadToolGL::qt_cast( clname ); } bool ST_Selection::qt_invoke( int _id, QUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: menu_slot((int)static_QUType_int.get(_o+1)); break; default: return CadToolGL::qt_invoke( _id, _o ); } return TRUE; } bool ST_Selection::qt_emit( int _id, QUObject* _o ) { return CadToolGL::qt_emit(_id,_o); } #ifndef QT_NO_PROPERTIES bool ST_Selection::qt_property( int id, int f, QVariant* v) { return CadToolGL::qt_property( id, f, v); } bool ST_Selection::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } #endif // QT_NO_PROPERTIES --- NEW FILE: Makefile.am --- INCLUDES = -I$(top_srcdir)/sqlite -I$(top_srcdir)/src/cadlib/core \ -I$(top_srcdir)/src/cadlib/gui -I$(top_srcdir)/src/common -I$(top_srcdir)/src/common/cadobj \ -I$(top_srcdir)/src/interfaces -I$(top_srcdir)/src/pcbedit -I$(top_srcdir)/src/pcbedit/pcbobj \ -I$(top_srcdir)/src/pcbedit/pcbtool -I$(top_srcdir)/src/projectmgr -I$(top_srcdir)/src/ui \ -I$(top_srcdir)/src/ui/pcb -Ikmdi $(all_includes) METASOURCES = AUTO lib_LTLIBRARIES = librapideds_pcbtool.la librapideds_pcbtool_la_LDFLAGS = $(all_libraries) noinst_HEADERS = pt_track.h pt_selection.h pt_pad.h pt_footprint.h \ pt_layerselector.h footprintbrowsedlg.h librapideds_pcbtool_la_SOURCES = pt_track.cpp pt_selection.cpp pt_pad.cpp \ pt_footprint.cpp pt_layerselector.cpp footprintbrowsedlg.cpp librapideds_pcbtool_la_LIBADD = $(top_builddir)/src/cadlib/gui/libgui.la --- NEW FILE: pt_footprint.h --- // file : pt_footprint.h // Descr : Place a component foorprint on the PCB // Author : Ricky White ( ri...@ne... ) // License : GNU GPL General Public License // Copyright : Copyright (C) Ricky White 2006 /////////////////////////////////////////////////////////////////////////////// #ifndef PT_FOOTPRINT_H #define PT_FOOTPRINT_H #include "cadobj/cadobj.h" #include "cadtool/cadtoolgl.h" #include "../pcbobj/po_pad.h" // Foward declarations class KHistoryCombo; /** Place a footprint on the PCB. @author Ricky White <ri...@ne...> */ class PT_Footprint : public CadToolGL { Q_OBJECT; public: PT_Footprint(QCanvasView *view, PrjDoc &prj); virtual ~PT_Footprint(); virtual void mousePressEvent( QMouseEvent *e ); virtual void mouseMoveEvent( QMouseEvent *e ); virtual QString name() { return "PT_Footprint"; } virtual void selected(); virtual void deselect(); public slots: void browseFootprints_slot(); protected: virtual void newObject(); PO_Pad *m_pad; KHistoryCombo* m_footprintCombo; KAction *m_searchAct, *m_recentAct, *m_labelAct; }; #endif --- NEW FILE: pt_track.cpp --- // file : .cpp // Descr : // Author : Ricky White ( ri...@ne... ) // License : GNU GPL General Public License // Copyright : Copyright (C) Ricky White 2004 /////////////////////////////////////////////////////////////////////////////// #include <qiconset.h> #include <klocale.h> #include <qcanvas.h> #include "../pcbedit.h" #include "pt_track.h" #include "../../images/pcb_track_tool.xpm" PT_Track::PT_Track(QCanvasView *view, PrjDoc &prj ) : CadToolGL( view, prj ), m_track(0) { m_view = view; m_action = new KAction("Place Track",QIconSet(QPixmap(pcb_track_tool)), 0, (PT_Track*)this, SLOT(selectTool_slot()), ((PcbEdit*)m_view)->actionCollection(),"pcb_track_tool"); setGrid( Units(1,Units::MM) ); } PT_Track::~PT_Track() { delete m_action; } /** Handle mouse movement when this tool is selected */ void PT_Track::mouseMoveEvent( QMouseEvent *e ) { CadToolGL::mouseMoveEvent(e); if( m_track && m_state==NEXT_PT ) m_track->setEnd(m_curPos); } void PT_Track::mousePressEvent( QMouseEvent *e ) { CadToolGL::mousePressEvent(e); if(e->button()==QMouseEvent::LeftButton) { switch( m_state ) { case FIRST_PT: emit setModified(); newObject(); m_track->setStart(m_curPos); m_track->setEnd(m_curPos); m_state = NEXT_PT; break; case NEXT_PT: m_track->setEnd(m_curPos); newObject(); m_track->setStart(m_curPos); m_track->setEnd(m_curPos); m_state = NEXT_PT; default: break; } } else if(e->button()==QMouseEvent::RightButton) { switch( m_state ) { case NEXT_PT: // abort current line m_track->hide(); delete m_track; m_track = 0; m_state = FIRST_PT; m_view->canvas()->update(); break; case FIRST_PT: // switch back to select tool static_cast<PcbEdit*>(m_view)->selectTool_slot(0); break; default: break; } } } void PT_Track::selected() { CadToolGL::selected(); emit statusBarMsg(i18n("Track Tool : Click to place track")); m_state = FIRST_PT; } void PT_Track::deselect() { CadToolGL::deselect(); delete m_track; m_track = 0; } void PT_Track::newObject() { m_state = FIRST_PT; m_track = new PO_Track((PcbCanvas*)static_cast<PcbEdit*>(m_view)->canvas()); m_track->setPos( m_curPos ); m_track->show(); } |
From: Ricky W. <ri...@us...> - 2006-08-26 13:21:35
|
Update of /cvsroot/reds/rapideds/src/schedit/schtool In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28791/src/schedit/schtool Modified Files: Makefile.am libbrowsedlg.cpp Log Message: Initial PCB framework Index: libbrowsedlg.cpp =================================================================== RCS file: /cvsroot/reds/rapideds/src/schedit/schtool/libbrowsedlg.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** libbrowsedlg.cpp 28 Apr 2005 08:25:23 -0000 1.2 --- libbrowsedlg.cpp 26 Aug 2006 13:21:32 -0000 1.3 *************** *** 30,33 **** --- 30,34 ---- #include <kcombobox.h> #include <kled.h> + #include <kconfig.h> // App Includes Index: Makefile.am =================================================================== RCS file: /cvsroot/reds/rapideds/src/schedit/schtool/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.am 14 Jul 2005 19:30:39 -0000 1.5 --- Makefile.am 26 Aug 2006 13:21:32 -0000 1.6 *************** *** 1,5 **** INCLUDES = -I$(top_srcdir)/sqlite -I$(top_srcdir)/src \ ! -I$(top_srcdir)/src/cadlib/core -I$(top_srcdir)/src/common -I$(top_srcdir)/src/interfaces \ ! -I$(top_srcdir)/src/projectmgr -I$(top_srcdir)/src/ui/schematic $(all_includes) METASOURCES = AUTO libschtool_la_LDFLAGS = $(all_libraries) --- 1,6 ---- INCLUDES = -I$(top_srcdir)/sqlite -I$(top_srcdir)/src \ ! -I$(top_srcdir)/src/cadlib -I$(top_srcdir)/src/cadlib/core -I$(top_srcdir)/src/common \ ! -I$(top_srcdir)/src/interfaces -I$(top_srcdir)/src/projectmgr -I$(top_srcdir)/src/ui/schematic \ ! $(all_includes) METASOURCES = AUTO libschtool_la_LDFLAGS = $(all_libraries) |
From: Ricky W. <ri...@us...> - 2006-08-26 13:21:35
|
Update of /cvsroot/reds/rapideds/src/ui In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28791/src/ui Modified Files: Makefile.am Log Message: Initial PCB framework Index: Makefile.am =================================================================== RCS file: /cvsroot/reds/rapideds/src/ui/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.am 14 Jul 2005 19:30:39 -0000 1.3 --- Makefile.am 26 Aug 2006 13:21:32 -0000 1.4 *************** *** 1,5 **** INCLUDES = -I$(top_srcdir)/src/common $(all_includes) METASOURCES = AUTO ! SUBDIRS = schematic cadlib lib_ui_la_LDFLAGS = $(all_libraries) noinst_LTLIBRARIES = lib-ui.la --- 1,5 ---- INCLUDES = -I$(top_srcdir)/src/common $(all_includes) METASOURCES = AUTO ! SUBDIRS = schematic cadlib pcb lib_ui_la_LDFLAGS = $(all_libraries) noinst_LTLIBRARIES = lib-ui.la *************** *** 7,10 **** printscale_form.ui netlist-browse-form.ui noinst_HEADERS = new_sheet_form.h netlist-browse-form.h ! lib_ui_la_LIBADD = $(top_builddir)/src/ui/schematic/libsch_ui.la \ ! $(top_builddir)/src/ui/cadlib/libui-cadlib.la --- 7,9 ---- printscale_form.ui netlist-browse-form.ui noinst_HEADERS = new_sheet_form.h netlist-browse-form.h ! |
From: Ricky W. <ri...@us...> - 2006-08-26 13:21:34
|
Update of /cvsroot/reds/rapideds/src/projectmgr In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28791/src/projectmgr Modified Files: Makefile.am editors.cpp prjdoc.h Log Message: Initial PCB framework Index: editors.cpp =================================================================== RCS file: /cvsroot/reds/rapideds/src/projectmgr/editors.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** editors.cpp 26 Apr 2005 15:27:38 -0000 1.3 --- editors.cpp 26 Aug 2006 13:21:31 -0000 1.4 *************** *** 24,28 **** #include "editors.h" #include "../schedit/scheditpart.h" ! // Constructor, load configuration from 'editors.cfg' Editors::Editors( PrjDoc &prjdoc ) --- 24,28 ---- #include "editors.h" #include "../schedit/scheditpart.h" ! #include "../pcbedit/pcbeditpart.h" // Constructor, load configuration from 'editors.cfg' Editors::Editors( PrjDoc &prjdoc ) *************** *** 270,275 **** { kdDebug()<<"New PCB document about to be created"<<endl; ! // newpart = new PCBEditorPart(m_splitter,"PCBPart",this,0,0); ! part=0; // dosen't exsist yet } break; --- 270,274 ---- { kdDebug()<<"New PCB document about to be created"<<endl; ! part = new PcbEditPart(parent,"PcbPart",parent,"PCB Editor",m_prjdoc); } break; Index: prjdoc.h =================================================================== RCS file: /cvsroot/reds/rapideds/src/projectmgr/prjdoc.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** prjdoc.h 24 Jul 2005 05:13:48 -0000 1.10 --- prjdoc.h 26 Aug 2006 13:21:31 -0000 1.11 *************** *** 14,18 **** #include "editors.h" #include "imagerepo.h" ! #include <common/netlist.h> class QImage; --- 14,19 ---- #include "editors.h" #include "imagerepo.h" ! //#include <common/netlist.h> ! #include "netlist.h" class QImage; Index: Makefile.am =================================================================== RCS file: /cvsroot/reds/rapideds/src/projectmgr/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.am 14 Jul 2005 19:30:38 -0000 1.5 --- Makefile.am 26 Aug 2006 13:21:31 -0000 1.6 *************** *** 1,4 **** ! INCLUDES = -I$(top_srcdir)/sqlite -I$(top_srcdir)/src \ ! -I$(top_srcdir)/src/common -I$(top_srcdir)/src/interfaces -I$(top_srcdir)/src/ui $(all_includes) METASOURCES = AUTO noinst_LTLIBRARIES = libprojectmgr.la --- 1,5 ---- ! INCLUDES = -I$(top_srcdir)/. -I$(top_srcdir)/sqlite -I$(top_srcdir)/src \ ! -I$(top_srcdir)/src/common -I$(top_srcdir)/src/interfaces -I$(top_srcdir)/src/projectmgr \ ! -I$(top_srcdir)/src/ui $(all_includes) METASOURCES = AUTO noinst_LTLIBRARIES = libprojectmgr.la |