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

List:       kde-commits
Subject:    playground/games/kolf-ng
From:       Stefan Majewsky <majewsky () gmx ! net>
Date:       2009-09-20 22:14:59
Message-ID: 1253484899.299532.20348.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1026161 by majewsky:

Unite Kolf::ImageViewer and Kolf::TextureListWidget into Kolf::BlenderWidget, \
removing many unneeded information from the image viewer in the process. (In fact, it \
is completely reduced to showing an image now.)

 M  +1 -2      CMakeLists.txt  
 M  +1 -1      editor/blender-blendthread.cpp  
 D             editor/blender-imageviewer.cpp  
 D             editor/blender-imageviewer.h  
 M  +2 -15     editor/blender-manager.cpp  
 M  +5 -6      editor/blender-manager.h  
 D             editor/blender-texturelistwidget.cpp  
 D             editor/blender-texturelistwidget.h  
 M  +8 -12     engine/game-editor.cpp  


--- trunk/playground/games/kolf-ng/CMakeLists.txt #1026160:1026161
@@ -16,12 +16,11 @@
 	3d/texturepool.cpp
 	editor/blender-blendthread.cpp
 	editor/blender-delegate.cpp
-	editor/blender-imageviewer.cpp
 	editor/blender-itemeditor.cpp
 	editor/blender-manager.cpp
 	editor/blender-model.cpp
 	editor/blender-texture.cpp
-	editor/blender-texturelistwidget.cpp
+	editor/blender-widget.cpp
 	editor/hmcreator-allselectbutton.cpp
 	editor/hmcreator-drawingboard.cpp
 	editor/hmcreator-ellipseselectbutton.cpp
--- trunk/playground/games/kolf-ng/editor/blender-blendthread.cpp #1026160:1026161
@@ -23,7 +23,7 @@
 	: QThread(parent)
 	, m_manager(manager)
 {
-	connect(this, SIGNAL(processFinished()), m_manager, SLOT(blendingFinished()));
+	connect(this, SIGNAL(processFinished()), m_manager, SIGNAL(blendingFinished()));
 }
 
 Kolf::BlendThread::~BlendThread()
--- trunk/playground/games/kolf-ng/editor/blender-manager.cpp #1026160:1026161
@@ -19,7 +19,6 @@
 #include "blender-manager.h"
 #include "blender-blendthread.h"
 #include "blender-delegate.h"
-#include "blender-imageviewer.h"
 #include "blender-model.h"
 #include "blender-texture.h"
 #include "hmcreator-drawingboard.h"
@@ -35,12 +34,11 @@
 	const QString TextureFileNamePattern("kolf-ng/courses/%1");
 }
 
-Kolf::BlenderManager::BlenderManager(ImageViewer* imageViewer, QObject* parent)
+Kolf::BlenderManager::BlenderManager(QObject* parent)
 	: QObject(parent)
 	, m_model(new TextureListModel())
 	, m_delegate(new TextureListDelegate())
 	, m_view(new QListView())
-	, m_imageViewer(imageViewer)
 	, m_isConfigurable(true)
 	, m_outputWidth(512)
 	, m_outputHeight(512)
@@ -52,7 +50,6 @@
 	m_view->setItemDelegate(m_delegate);
 	m_view->setSelectionBehavior(QAbstractItemView::SelectRows);
 	m_view->setSelectionMode(QAbstractItemView::ExtendedSelection);
-	m_imageViewer->setLeftText(i18n("No heightmap loaded"));
 	connect(m_model, SIGNAL(texturesModified(bool)),
 		this, SLOT(setTexturesModified(bool)));
 	loadDefaultTextureSet();
@@ -70,8 +67,7 @@
 	m_isConfigurable = false;
 
 	QStringList fileNames;
-	fileNames = QFileDialog::getOpenFileNames(m_imageViewer,
-		i18n("Open Image"), "./", i18n("Image Files (*.png *.jpg *.bmp)"));
+	fileNames = QFileDialog::getOpenFileNames(0, i18n("Open Image"), "./", i18n("Image \
Files (*.png *.jpg *.bmp)"));  m_model->insertRows(fileNames, 0);
 
 	m_isConfigurable = true;
@@ -171,11 +167,6 @@
 	m_isConfigurable = true;
 }
 
-void Kolf::BlenderManager::blendingFinished()
-{
-	m_imageViewer->showImage(m_blendResult);
-}
-
 bool Kolf::BlenderManager::setHeightmap()
 {
 	QMutexLocker locker(&m_mutex);
@@ -189,8 +180,6 @@
 	m_heightmap = Heightmap(m_drawingBoard->image().toImage());
 	//set Kolf::DrawingBoard::isEditedFromLastBlending to false.
 	m_drawingBoard->setEditFlag(false);
-	if (!m_heightmap.isNull())
-		m_imageViewer->setLeftText(i18n("Heightmap loaded"));
 	m_isConfigurable = true;
 	return true;
 }
@@ -198,13 +187,11 @@
 void Kolf::BlenderManager::setOutputWidth(int width)
 {
 	m_outputWidth = width;
-	m_imageViewer->setRightText(QString("Output texture\n size: \
(%1,%2)").arg(m_outputWidth).arg(m_outputHeight));  }
 
 void Kolf::BlenderManager::setOutputHeight(int height)
 {
 	m_outputHeight = height;
-	m_imageViewer->setRightText(QString("Output texture\n size: \
(%1,%2)").arg(m_outputWidth).arg(m_outputHeight));  }
 
 #include "blender-manager.moc"
--- trunk/playground/games/kolf-ng/editor/blender-manager.h #1026160:1026161
@@ -29,7 +29,6 @@
 {
 	class BlendThread;
 	class DrawingBoard;
-	class ImageViewer;
 	class TextureListModel;
 	class TextureListDelegate;
 
@@ -37,19 +36,21 @@
 	{
 		Q_OBJECT
 		public:
-			explicit BlenderManager(ImageViewer* imageViewer, QObject* parent = 0);
+			explicit BlenderManager(QObject* parent = 0);
 			~BlenderManager();
 			Heightmap heightmap() const {return m_heightmap;}
 			int outputWidth() const {return m_outputWidth;}
 			int outputHeight() const {return m_outputHeight;}
 			QListView* view() const {return m_view;}
-			void setImageViewer(ImageViewer* imageViewer) {m_imageViewer = imageViewer;}
 			void setDrawingBoard(DrawingBoard* board) {m_drawingBoard = board;}
 			QMutex& mutex() {return m_mutex;}
+			QImage blendResult() const {return m_blendResult;}
 
 		public Q_SLOTS:
 			bool setHeightmap();
 			void setTexturesModified(bool flag) {m_texturesModified = flag;}
+		Q_SIGNALS:
+			void blendingFinished();
 		private Q_SLOTS:
 			void addTextures();
 			void addTextures(const QStringList& fileNames);
@@ -57,18 +58,16 @@
 			void loadDefaultTextureSet();
 			void startBlending();
 			void processBlending();
-			void blendingFinished();
 			void setOutputWidth(int width);
 			void setOutputHeight(int height);
 
-		friend class BlendThread;
+			friend class BlendThread;
 
 		private:
 			TextureListModel* m_model;
 			TextureListDelegate* m_delegate;
 			QListView* m_view;	
 			Heightmap m_heightmap;
-			ImageViewer* m_imageViewer;
 
 			QImage m_blendResult;
 			bool m_isConfigurable;
--- trunk/playground/games/kolf-ng/engine/game-editor.cpp #1026160:1026161
@@ -20,9 +20,8 @@
 #include "component-basicviews.h"
 #include "course.h"
 #include "player.h"
-#include "../editor/blender-imageviewer.h"
 #include "../editor/blender-manager.h"
-#include "../editor/blender-texturelistwidget.h"
+#include "../editor/blender-widget.h"
 #include "../editor/hmcreator-drawingboard.h"
 #include "../editor/hmcreator-toolbox.h"
 #include "../elements/ball.h"
@@ -62,33 +61,30 @@
 
 	//page widgets: basic views
 	addPageWidget(new Kolf::View2DComponent);
+
 	//Blender's part
-	Kolf::ImageViewer* imageViewer = new Kolf::ImageViewer;
-	addPageWidget(imageViewer);
-	Kolf::TextureListWidget* textureListWidget = new \
                Kolf::TextureListWidget(imageViewer);
-	addDockWidget(textureListWidget);
+	Kolf::BlenderWidget* blenderWidget = new Kolf::BlenderWidget;
+	addPageWidget(blenderWidget);
 
 	//Heightmap creator's part
 	Kolf::DrawingBoard* drawingBoard = new Kolf::DrawingBoard;
 	addPageWidget(drawingBoard);
 	addDockWidget(new Kolf::ToolBox(drawingBoard));
-	textureListWidget->blenderManager()->setDrawingBoard(drawingBoard);
+	blenderWidget->manager()->setDrawingBoard(drawingBoard);
 	connect(drawingBoard, SIGNAL(heightmapChanged()),
-		textureListWidget->blenderManager(), SLOT(setHeightmap()));
-	connect(imageViewer, SIGNAL(shown()),
-		textureListWidget->blenderManager(), SLOT(startBlending()));
+		blenderWidget->manager(), SLOT(setHeightmap()));
 
  	//Action: texture blender -- add textures
  	KAction* addTexAction = new KAction(KIcon("archive-insert"),i18n("Add texture"), \
actionCollection());  addTexAction->setToolTip(i18n("Add a new texture"));
 	actionCollection()->addAction("blender-addTexture", addTexAction);
-	connect(addTexAction, SIGNAL(triggered()), textureListWidget->blenderManager(), \
SLOT(addTextures())); +	connect(addTexAction, SIGNAL(triggered()), \
blenderWidget->manager(), SLOT(addTextures()));  
  	//Action: texture blender -- delete textures
 	KAction* delTexAction = new KAction(KIcon("archive-remove"), i18n("Delete \
texture"), actionCollection());  delTexAction->setToolTip(i18n("Delete a texture in \
the list"));  actionCollection()->addAction("blender-delTexture", delTexAction);
-	connect(delTexAction, SIGNAL(triggered()), textureListWidget->blenderManager(), \
SLOT(delTextures())); +	connect(delTexAction, SIGNAL(triggered()), \
blenderWidget->manager(), SLOT(delTextures()));  
 }
 


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