diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt index 05cc93f89..a7a694463 100644 --- a/apps/opencs/CMakeLists.txt +++ b/apps/opencs/CMakeLists.txt @@ -60,7 +60,7 @@ opencs_hdrs_noqt (view/doc opencs_units (view/world table tablesubview scriptsubview util regionmapsubview tablebottombox creator genericcreator cellcreator referenceablecreator referencecreator scenesubview scenetoolbar scenetool - scenetoolmode infocreator scriptedit dialoguesubview previewsubview scenetoolgrid + scenetoolmode infocreator scriptedit dialoguesubview previewsubview ) opencs_units (view/render diff --git a/apps/opencs/view/world/scenesubview.cpp b/apps/opencs/view/world/scenesubview.cpp index d62793cc9..4ebaa9352 100644 --- a/apps/opencs/view/world/scenesubview.cpp +++ b/apps/opencs/view/world/scenesubview.cpp @@ -18,7 +18,6 @@ #include "creator.hpp" #include "scenetoolbar.hpp" #include "scenetoolmode.hpp" -#include "scenetoolgrid.hpp" CSVWorld::SceneSubView::SceneSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document) : SubView (id) @@ -37,8 +36,6 @@ CSVWorld::SceneSubView::SceneSubView (const CSMWorld::UniversalId& id, CSMDoc::D SceneToolbar *toolbar = new SceneToolbar (48+6, this); - SceneToolGrid *gridTool = 0; - if (id.getId()=="sys::default") { CSVRender::PagedWorldspaceWidget *widget = new CSVRender::PagedWorldspaceWidget (this); @@ -47,13 +44,6 @@ CSVWorld::SceneSubView::SceneSubView (const CSMWorld::UniversalId& id, CSMDoc::D SIGNAL (cellIndexChanged (const std::pair&, const std::pair&)), this, SLOT (cellIndexChanged (const std::pair&, const std::pair&))); - - gridTool = new SceneToolGrid (toolbar); - - connect (widget, - SIGNAL (cellIndexChanged (const std::pair&, const std::pair&)), - gridTool, - SLOT (cellIndexChanged (const std::pair&, const std::pair&))); } else mScene = new CSVRender::UnpagedWorldspaceWidget (id.getId(), document, this); @@ -64,9 +54,6 @@ CSVWorld::SceneSubView::SceneSubView (const CSMWorld::UniversalId& id, CSMDoc::D SceneToolMode *lightingTool = mScene->makeLightingSelector (toolbar); toolbar->addTool (lightingTool); - if (gridTool) - toolbar->addTool (gridTool); - layout2->addWidget (toolbar, 0); layout2->addWidget (mScene, 1); diff --git a/apps/opencs/view/world/scenetoolgrid.cpp b/apps/opencs/view/world/scenetoolgrid.cpp deleted file mode 100644 index 0769be168..000000000 --- a/apps/opencs/view/world/scenetoolgrid.cpp +++ /dev/null @@ -1,75 +0,0 @@ - -#include "scenetoolgrid.hpp" - -#include - -#include -#include -#include - -#include "scenetoolbar.hpp" - -CSVWorld::SceneToolGrid::SceneToolGrid (SceneToolbar *parent) -: SceneTool (parent), mIconSize (parent->getIconSize()) -{ -} - -void CSVWorld::SceneToolGrid::showPanel (const QPoint& position) -{ - - -} - -void CSVWorld::SceneToolGrid::cellIndexChanged (const std::pair& min, - const std::pair& max) -{ - /// \todo make font size configurable - const int fontSize = 8; - - /// \todo replace with proper icon - QPixmap image (mIconSize, mIconSize); - image.fill (QColor (0, 0, 0, 0)); - - { - QPainter painter (&image); - painter.setPen (Qt::black); - QFont font (QApplication::font().family(), fontSize); - painter.setFont (font); - - QFontMetrics metrics (font); - - if (min==max) - { - // single cell - std::ostringstream stream; - stream << min.first << ", " << min.second; - - QString text = QString::fromUtf8 (stream.str().c_str()); - - painter.drawText (QPoint ((mIconSize-metrics.width (text))/2, mIconSize/2+fontSize/2), - text); - } - else - { - // range - { - std::ostringstream stream; - stream << min.first << ", " << min.second; - painter.drawText (QPoint (0, mIconSize), - QString::fromUtf8 (stream.str().c_str())); - } - - { - std::ostringstream stream; - stream << max.first << ", " << max.second; - - QString text = QString::fromUtf8 (stream.str().c_str()); - - painter.drawText (QPoint (mIconSize-metrics.width (text), fontSize), text); - } - } - } - - QIcon icon (image); - setIcon (icon); -} \ No newline at end of file diff --git a/apps/opencs/view/world/scenetoolgrid.hpp b/apps/opencs/view/world/scenetoolgrid.hpp deleted file mode 100644 index 917df2a16..000000000 --- a/apps/opencs/view/world/scenetoolgrid.hpp +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef CSV_WORLD_SCENETOOL_GRID_H -#define CSV_WORLD_SCENETOOL_GRID_H - -#include "scenetool.hpp" - -namespace CSVWorld -{ - class SceneToolbar; - - ///< \brief Cell grid selector tool - class SceneToolGrid : public SceneTool - { - Q_OBJECT - - int mIconSize; - - public: - - SceneToolGrid (SceneToolbar *parent); - - virtual void showPanel (const QPoint& position); - - public slots: - - void cellIndexChanged (const std::pair& min, const std::pair& max); - }; -} - -#endif