[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src sheetcanvas/CMakeLists.txt travers...
From: |
Remon Sijrier |
Subject: |
[Traverso-commit] traverso/src sheetcanvas/CMakeLists.txt travers... |
Date: |
Sat, 24 May 2008 17:30:33 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 08/05/24 17:30:33
Modified files:
src/sheetcanvas: CMakeLists.txt
src/traverso : CMakeLists.txt
Removed files:
src/sheetcanvas: FadeContextDialogView.cpp
FadeContextDialogView.h
src/traverso : ContextDialog.cpp ContextDialog.h
Log message:
* more *ContextDialog* removal
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/sheetcanvas/CMakeLists.txt?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/sheetcanvas/FadeContextDialogView.cpp?cvsroot=traverso&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/traverso/src/sheetcanvas/FadeContextDialogView.h?cvsroot=traverso&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/CMakeLists.txt?cvsroot=traverso&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ContextDialog.cpp?cvsroot=traverso&r1=1.4&r2=0
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ContextDialog.h?cvsroot=traverso&r1=1.3&r2=0
Patches:
Index: sheetcanvas/CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/src/sheetcanvas/CMakeLists.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- sheetcanvas/CMakeLists.txt 21 Jan 2008 16:17:27 -0000 1.1
+++ sheetcanvas/CMakeLists.txt 24 May 2008 17:30:31 -0000 1.2
@@ -25,7 +25,6 @@
Cursors.cpp
CurveNodeView.cpp
CurveView.cpp
-FadeContextDialogView.cpp
FadeView.cpp
MarkerView.cpp
PluginChainView.cpp
Index: traverso/CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/CMakeLists.txt,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- traverso/CMakeLists.txt 24 May 2008 17:24:05 -0000 1.15
+++ traverso/CMakeLists.txt 24 May 2008 17:30:32 -0000 1.16
@@ -24,7 +24,6 @@
${CMAKE_SOURCE_DIR}/src/common/fpu.cc
Traverso.cpp
BusMonitor.cpp
-ContextDialog.cpp
Main.cpp
PluginSelectorDialog.cpp
Interface.cpp
Index: sheetcanvas/FadeContextDialogView.cpp
===================================================================
RCS file: sheetcanvas/FadeContextDialogView.cpp
diff -N sheetcanvas/FadeContextDialogView.cpp
--- sheetcanvas/FadeContextDialogView.cpp 21 Jan 2008 16:17:28 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,162 +0,0 @@
-/*
-Copyright (C) 2006 Remon Sijrier, Nicola Doebelin
-
-This file is part of Traverso
-
-Traverso 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.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
-$Id: FadeContextDialogView.cpp,v 1.1 2008/01/21 16:17:28 r_sijrier Exp $
-*/
-
-#include "FadeContextDialogView.h"
-
-#include "ViewPort.h"
-#include "Themer.h"
-#include "FadeCurve.h"
-#include "CurveNode.h"
-#include "Command.h"
-#include <ContextPointer.h>
-
-#include <QPainterPath>
-
-#include <Debugger.h>
-
-static const int GRID_LINES = 4;
-static const float RASTER_SIZE = 0.05;
-static const int DOT_SIZE = 6;
-static const QString DOT_COLOR = "#78817B";
-static const QString INACTIVE_COLOR = "#A6B2A9";
-
-
-FadeContextDialogView::FadeContextDialogView(ViewPort* viewPort, FadeCurve*
fadeCurve)
- : ViewItem(0, fadeCurve), m_vp(viewPort), m_fade(fadeCurve)
-{
- connect(m_vp, SIGNAL(resized()), this, SLOT(resize()));
- connect(m_fade, SIGNAL(stateChanged()), this,
SLOT(schedule_for_repaint()));
-}
-
-
-FadeContextDialogView::~FadeContextDialogView()
-{}
-
-
-void FadeContextDialogView::paint(QPainter *painter, const
QStyleOptionGraphicsItem *option, QWidget *widget)
-{
-/*
- // Draw the background pixmap
- painter->drawPixmap(0, 0, background);
-
- painter->setRenderHint(QPainter::Antialiasing);
-
- // Calculate and draw control points
- int h = m_vp->height() - 1;
- int w = m_vp->width() - 1;
- QList<QPointF> points = m_fade->get_control_points();
- QPoint p1(int(points.at(1).x() * w + 0.5), h - int(points.at(1).y() * h
+ 0.5));
- QPoint p2(w - int((1.0 - points.at(2).x()) * w + 0.5), int((1.0 -
points.at(2).y()) * h + 0.5));
-
- painter->setPen(QColor(DOT_COLOR));
- painter->setBrush(QColor(DOT_COLOR));
-
- if (m_fade->get_fade_type() == FadeCurve::FadeOut) {
- p1.setX(w - int((1 - points.at(2).x()) * w + 0.5));
- p1.setY(h - int((1 - points.at(2).y()) * h + 0.5));
- p2.setX(int((points.at(1).x()) * w + 0.5));
- p2.setY(int((points.at(1).y()) * h + 0.5));
- painter->drawLine(w, h, p1.x(), p1.y());
- painter->drawLine(0, 0, p2.x(), p2.y());
- } else {
- painter->drawLine(0, h, p1.x(), p1.y());
- painter->drawLine(w, 0, p2.x(), p2.y());
- }
-
- painter->drawEllipse(p1.x() - DOT_SIZE/2, p1.y() - DOT_SIZE/2,
DOT_SIZE, DOT_SIZE);
- painter->drawEllipse(p2.x() - DOT_SIZE/2, p2.y() - DOT_SIZE/2,
DOT_SIZE, DOT_SIZE);
-
-
- QPolygonF polygon;
- float value[2];
- int step = 0;
- int height = m_vp->height();
-
- int zoom = (int) m_fade->get_range() / m_vp->width();
-
- // Populate the polygon with enough points to draw a smooth curve.
- // using a 2 pixel resolution, is sufficient enough
- for (int i=0; i < m_vp->width(); i+=2) {
- m_fade->get_vector(i * zoom, i * zoom + 1, value, 2);
- polygon << QPointF( step, height - (value[1] * height) );
- step += 2;
- }
-
- // Always add the uppermost point in the polygon path
- // since the above routine potentially does not include it.
- polygon << QPointF(m_vp->width(), 0);
-
- // Draw the curve
- QPainterPath path;
- path.moveTo(0, m_vp->height());
- path.addPolygon(polygon);
- path.lineTo(0, 0);
- path.closeSubpath();
-
- painter->setPen(Qt::NoPen);
- painter->setBrush(QColor(255, 0, 255, 80));
-
- painter->drawPath(path);
-*/
-}
-
-
-
-
-void FadeContextDialogView::create_background( )
-{
- if (background.size() != m_vp->size()) {
- background = QPixmap(m_vp->width(), m_vp->height());
- }
-
- QPainter painter(&background);
-
-// painter->setRenderHint(QPainter::Antialiasing);
-
- // Background color
- painter.fillRect(0, 0, m_vp->width(), m_vp->height(),
themer()->get_color("CLIP_BG_DEFAULT"));
-
- // grid lines
- painter.setPen(QColor(INACTIVE_COLOR));
- for (int i = 0; i <= GRID_LINES; i++) {
- float d = (float)i / (float)GRID_LINES;
- int x = (int)(m_vp->width() * d);
- int y = (int)(m_vp->height() * d);
- painter.drawLine(x, 0, x, m_vp->height());
- painter.drawLine(0, y, m_vp->width(), y);
- }
-
-}
-
-
-
-/******** SLOTS ***************/
-
-void FadeContextDialogView::resize( )
-{
- create_background();
-}
-
-
-
-
-//eof
Index: sheetcanvas/FadeContextDialogView.h
===================================================================
RCS file: sheetcanvas/FadeContextDialogView.h
diff -N sheetcanvas/FadeContextDialogView.h
--- sheetcanvas/FadeContextDialogView.h 21 Jan 2008 16:17:28 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,63 +0,0 @@
-/*
-Copyright (C) 2006 Remon Sijrier, Nicola Doebelin
-
-This file is part of Traverso
-
-Traverso 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.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
-$Id: FadeContextDialogView.h,v 1.1 2008/01/21 16:17:28 r_sijrier Exp $
-*/
-
-#ifndef FADE_CONTEXT_DIALOG_VIEW_H
-#define FADE_CONTEXT_DIALOG_VIEW_H
-
-#include "ViewItem.h"
-
-#include <QPixmap>
-#include "Command.h"
-
-class ViewPort;
-class FadeCurve;
-
-class FadeContextDialogView : public ViewItem
-{
- Q_OBJECT
-
-public:
- FadeContextDialogView(ViewPort* viewPort, FadeCurve* fadeCurve);
- ~FadeContextDialogView();
-
- void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
QWidget *widget);
-
- QRect draw(QPainter& p);
-
- float roundFloat(float f);
-
-private:
- void create_background();
-
- QPixmap background;
- ViewPort* m_vp;
- FadeCurve* m_fade;
-
-private slots:
- void resize();
-};
-
-
-#endif
-
-//eof
-
Index: traverso/ContextDialog.cpp
===================================================================
RCS file: traverso/ContextDialog.cpp
diff -N traverso/ContextDialog.cpp
--- traverso/ContextDialog.cpp 18 Jan 2007 11:34:12 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,60 +0,0 @@
-/*
-Copyright (C) 2006 Remon Sijrier
-
-This file is part of Traverso
-
-Traverso 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.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
-$Id: ContextDialog.cpp,v 1.4 2007/01/18 11:34:12 r_sijrier Exp $
-*/
-
-#include "ContextDialog.h"
-
-#include <QHBoxLayout>
-
-#include <InputEngine.h>
-#include <ViewPort.h>
-
-#include <Debugger.h>
-
-ContextDialog::ContextDialog()
- : ViewPort(0)
-{
- PENTERCONS;
-}
-
-ContextDialog::~ContextDialog()
-{
- PENTERDES;
-}
-
-void ContextDialog::keyPressEvent( QKeyEvent * e)
-{
- if ( (e->key() == Qt::Key_Return) || (e->key() == Qt::Key_Escape) ) {
- close();
- }
-
- ie().catch_key_press(e);
- e->ignore();
-}
-
-void ContextDialog::keyReleaseEvent( QKeyEvent * e)
-{
- ie().catch_key_release(e);
- e->ignore();
-}
-
-
-//eof
Index: traverso/ContextDialog.h
===================================================================
RCS file: traverso/ContextDialog.h
diff -N traverso/ContextDialog.h
--- traverso/ContextDialog.h 11 Aug 2007 22:54:58 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,46 +0,0 @@
-/*
-Copyright (C) 2006 Remon Sijrier
-
-This file is part of Traverso
-
-Traverso 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.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
-$Id: ContextDialog.h,v 1.3 2007/08/11 22:54:58 benjie Exp $
-*/
-
-#ifndef CONTEXT_DIALOG_H
-#define CONTEXT_DIALOG_H
-
-#include <ViewPort.h>
-
-
-class ContextItem;
-
-class ContextDialog : public ViewPort
-{
-public:
- ContextDialog();
- ~ContextDialog();
-
- void get_pointed_context_items(QList<ContextItem* > &list)
{Q_UNUSED(list);};
-
-protected:
- void keyPressEvent ( QKeyEvent* e);
- void keyReleaseEvent ( QKeyEvent* e);
-};
-
-#endif
-
-//eof
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso/src sheetcanvas/CMakeLists.txt travers...,
Remon Sijrier <=