[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/edu/kdissert
From:       Thomas Nagy <tnagyemail-mail () yahoo ! fr>
Date:       2005-09-30 21:32:13
Message-ID: 1128115933.697785.27083.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 465806 by tnagy:

Code cleanup


 M  +1 -1      SConstruct  
 D             VERSION  
 M  +0 -78     src/kdissert/canvasview/DCanvasView.cpp  
 M  +0 -35     src/kdissert/canvasview/DCanvasView.h  


--- trunk/playground/edu/kdissert/SConstruct #465805:465806
@@ -31,5 +31,5 @@
 ###################################################################
 # CONVENIENCE FUNCTIONS TO EMULATE 'make dist' and 'make distclean'
 ###################################################################
-env.dist('kdissert')
+env.dist('kdissert', '1.0.5')
 
--- trunk/playground/edu/kdissert/src/kdissert/canvasview/DCanvasView.cpp #465805:465806
@@ -45,62 +45,6 @@
 
 unsigned int DCanvasView::ExtensionLock::m_neesting = 0;
 
-MiniView::MiniView(QWidget* parent) : QCanvasView(parent)
-{
-	setBackgroundMode(Qt::NoBackground);
-}
-
-void MiniView::setZoomRect(const QRect& r)
-{
-	QRect oldRect = m_zoomRect;
-	m_zoomRect = worldMatrix().mapRect(r);
-	updateContents(oldRect);
-	updateContents(m_zoomRect);
-}
-
-void MiniView::drawContents(QPainter* p, int cx, int cy, int cw, int ch)
-{
-	p->save();
-	QCanvasView::drawContents(p, cx, cy, cw, ch);
-	p->restore();
-
-	if (m_zoomRect.isValid()) 
-	{
-		p->setPen(Qt::red);
-		p->drawRoundRect(m_zoomRect, 5, 5);
-	}
-}
-
-void MiniView::contentsMousePressEvent(QMouseEvent* me)
-{
-	QPoint p = me->pos();
-	if (m_zoomRect.isValid())
-		return;
-
-	QPoint c = m_zoomRect.center();
-	QPoint pos = inverseWorldMatrix().map(p - c);
-	emit scrollTo( pos );
-}
-
-void MiniView::contentsMouseMoveEvent(QMouseEvent* me)
-{
-	QPoint p=me->pos();
-	QPoint pos = inverseWorldMatrix().map(p);
-	emit scrollTo( pos );
-}
-
-void MiniView::resizeEvent(QResizeEvent *me)
-{
-	m_size = width();
-	if (height() < m_size) m_size = height();
-
-	if (m_size<10) return;
-	
-	QWMatrix wm;
-	wm.scale(((double) m_size)/canvas()->width(), ((double) m_size)/canvas()->height());
-	setWorldMatrix(wm);
-}
-
 DCanvasView::DCanvasView(QWidget* parent, const char*) : QCanvasView(parent), DGuiView(parent)
 {
 	m_pressed       = false;
@@ -110,7 +54,6 @@
 	m_startItem     = NULL;
 	m_selectedlink  = NULL;
 	m_selectedref   = NULL;
-	m_miniview      = NULL;
 	
 	m_lastitemtoselect = DItem::NOITEM;
 	m_lastitem = DItem::NOITEM;
@@ -152,30 +95,10 @@
 	center(canvas()->width()/2, canvas()->height()/2);
 }
 
-QWidget *DCanvasView::addMiniView(QWidget* wid)
-{
-	if (m_miniview != NULL) return m_miniview;
-
-	// setup the miniview
-	m_miniview = new MiniView(wid);
-	m_miniview->setCanvas(canvas());
-	m_miniview->show();
-	m_miniview->raise();
-	m_miniview->setHScrollBarMode(QScrollView::AlwaysOff);
-	m_miniview->setVScrollBarMode(QScrollView::AlwaysOff);
-	m_miniview->resize(150, 150);
-
-	connect(m_miniview, SIGNAL(scrollTo(const QPoint&)), this, SLOT(scrollTo(const QPoint&)));
-
-	return m_miniview;
-}
-
 DCanvasView::~DCanvasView()
 {
 	unplug();
 
-	delete m_miniview;
-	
 	delete m_tooltip;
 	delete m_rubberRect;
 	delete m_rubberLine;
@@ -217,7 +140,6 @@
 	center( p.x(), p.y() );
 
 	QRect rc = QRect( contentsX(), contentsY(), visibleWidth(), visibleHeight() );
-	if (m_miniview) m_miniview->setZoomRect( inverseWorldMatrix().mapRect(rc) );
 }
 
 void DCanvasView::focusOnRoot()
--- trunk/playground/edu/kdissert/src/kdissert/canvasview/DCanvasView.h #465805:465806
@@ -34,7 +34,6 @@
 class DCanvasPopup;
 class QRect;
 class DCanvasRef;
-class MiniView;
 
 /**
  * This class is a view for the mindmap
@@ -59,11 +58,6 @@
 		DCanvasView( QWidget* parent=0, const char* name=0 );
 		~DCanvasView();
 
-		/**
-		 * Request a miniview for zooming
-		 */
-		QWidget *DCanvasView::addMiniView(QWidget*);
-		
 		bool oneItemIsSelected() const;
 		bool itemsAreSelected() const;
 
@@ -184,8 +178,6 @@
 		/// default width and height for the
 		static const int m_defaultsize = 3000;
 
-		MiniView *m_miniview;
-		
 		// global tooltip (TODO : improve it to display pictures, .. like in konqueror)
 		DCanvasTip *m_tooltip;
 
@@ -301,31 +293,4 @@
 		void scrollTo(const QPoint&); // for the miniview
 };
 
-// MiniView is *very* similar to karbon or kcachegrind navigation widgets
-class MiniView : public QCanvasView
-{
-	Q_OBJECT
-
-	public:
-		MiniView(QWidget *parent);
-		~MiniView() {}
-		
-		void setZoomRect(const QRect& r);
-
-		void resizeEvent(QResizeEvent *me);
-		
-	signals:
-		void scrollTo(const QPoint&);
-
-	protected:
-		void contentsMousePressEvent(QMouseEvent*);
-		void contentsMouseMoveEvent(QMouseEvent*);
-		//void contentsMouseReleaseEvent(QMouseEvent*);
-
-		void drawContents(QPainter*, int, int, int, int);
-
-		int m_size;
-		QRect m_zoomRect;
-};
-
 #endif // _DCANVASVIEW_H
[prev in list] [next in list] [prev in thread] [next in thread]