[Kst] branches/work/kst/portto4/kst/src
Barth Netterfield
netterfield at astro.utoronto.ca
Mon Jul 14 01:08:37 CEST 2008
SVN commit 832048 by netterfield:
-Clean up some dead code
-some toolbar work
M +0 -1 d2asc/d2asc.cpp
M +0 -1 d2d/d2d.cpp
M +0 -1 libkstapp/basicplugindialog.cpp
M +0 -1 libkstapp/csddialog.cpp
M +0 -1 libkstapp/curvedialog.cpp
M +0 -1 libkstapp/datawizard.cpp
M +0 -1 libkstapp/document.cpp
M +0 -1 libkstapp/equationdialog.cpp
M +0 -1 libkstapp/eventmonitordialog.cpp
M +0 -1 libkstapp/histogramdialog.cpp
M +0 -1 libkstapp/imagedialog.cpp
M +0 -1 libkstapp/labelrenderer.cpp
M +12 -5 libkstapp/mainwindow.cpp
M +2 -1 libkstapp/mainwindow.h
M +0 -1 libkstapp/matrixdialog.cpp
M +0 -1 libkstapp/plotitem.cpp
M +0 -1 libkstapp/powerspectrumdialog.cpp
M +0 -23 libkstapp/vectordialog.cpp
M +0 -1 libkstmath/dataobject.cpp
D libkstmath/dataobjectcollection.cpp
D libkstmath/dataobjectcollection.h
M +0 -2 libkstmath/libkstmath.pro
--- branches/work/kst/portto4/kst/src/d2asc/d2asc.cpp #832047:832048
@@ -20,7 +20,6 @@
#include "datavector.h"
#include "datacollection.h"
-#include "dataobjectcollection.h"
#include "coredocument.h"
#include "objectstore.h"
--- branches/work/kst/portto4/kst/src/d2d/d2d.cpp #832047:832048
@@ -22,7 +22,6 @@
#define protected public
#include "datavector.h"
#include "datacollection.h"
-#include "dataobjectcollection.h"
#undef protected
#include "dataplugin.h"
--- branches/work/kst/portto4/kst/src/libkstapp/basicplugindialog.cpp #832047:832048
@@ -14,7 +14,6 @@
#include "dialogpage.h"
#include "datacollection.h"
-#include "dataobjectcollection.h"
#include "document.h"
#include "basicplugin.h"
--- branches/work/kst/portto4/kst/src/libkstapp/csddialog.cpp #832047:832048
@@ -29,7 +29,6 @@
#include "image.h"
#include "datacollection.h"
-#include "dataobjectcollection.h"
#include <QPushButton>
--- branches/work/kst/portto4/kst/src/libkstapp/curvedialog.cpp #832047:832048
@@ -24,7 +24,6 @@
#include "plotrenderitem.h"
#include "datacollection.h"
-#include "dataobjectcollection.h"
#include "document.h"
#include "objectstore.h"
--- branches/work/kst/portto4/kst/src/libkstapp/datawizard.cpp #832047:832048
@@ -19,7 +19,6 @@
#include "colorsequence.h"
#include "curve.h"
#include "datacollection.h"
-#include "dataobjectcollection.h"
#include "datasourcedialog.h"
#include "datavector.h"
#include "dialogdefaults.h"
--- branches/work/kst/portto4/kst/src/libkstapp/document.cpp #832047:832048
@@ -16,7 +16,6 @@
#include <datasourcefactory.h>
#include <graphicsfactory.h>
#include <datacollection.h>
-#include <dataobjectcollection.h>
#include <objectfactory.h>
#include <primitivefactory.h>
#include <relationfactory.h>
--- branches/work/kst/portto4/kst/src/libkstapp/equationdialog.cpp #832047:832048
@@ -15,7 +15,6 @@
#include "editmultiplewidget.h"
#include "datacollection.h"
-#include "dataobjectcollection.h"
#include "equation.h"
#include "plotitem.h"
#include "plotrenderitem.h"
--- branches/work/kst/portto4/kst/src/libkstapp/eventmonitordialog.cpp #832047:832048
@@ -15,7 +15,6 @@
#include "editmultiplewidget.h"
#include "datacollection.h"
-#include "dataobjectcollection.h"
#include "document.h"
#include "objectstore.h"
--- branches/work/kst/portto4/kst/src/libkstapp/histogramdialog.cpp #832047:832048
@@ -27,7 +27,6 @@
#include "objectstore.h"
#include "datacollection.h"
-#include "dataobjectcollection.h"
#include "dialogdefaults.h"
namespace Kst {
--- branches/work/kst/portto4/kst/src/libkstapp/imagedialog.cpp #832047:832048
@@ -27,7 +27,6 @@
#include "objectstore.h"
#include "datacollection.h"
-#include "dataobjectcollection.h"
namespace Kst {
--- branches/work/kst/portto4/kst/src/libkstapp/labelrenderer.cpp #832047:832048
@@ -19,7 +19,6 @@
#include "enodes.h"
#include "datacollection.h"
-#include "dataobjectcollection.h"
#include "ksttimers.h"
#include "labelparser.h"
#include "document.h"
--- branches/work/kst/portto4/kst/src/libkstapp/mainwindow.cpp #832047:832048
@@ -52,7 +52,6 @@
#include "editablevector.h"
#include "generatedvector.h"
#include "datacollection.h"
-#include "dataobjectcollection.h"
#include "equation.h"
#include "datavector.h"
@@ -136,6 +135,7 @@
_breakLayoutAct->setEnabled(layoutMode);
_layoutToolBar->setVisible(layoutMode);
+ _zoomToolBar->setVisible(!layoutMode);
}
@@ -570,14 +570,17 @@
_changeDataSampleDialogAct = new QAction(tr("Change Data Sample Range"), this);
_changeDataSampleDialogAct->setStatusTip(tr("Show Kst's Change Data Sample Range Dialog"));
+ _changeDataSampleDialogAct->setIcon(QPixmap(":kst_changenpts.png"));
connect(_changeDataSampleDialogAct, SIGNAL(triggered()), this, SLOT(showChangeDataSampleDialog()));
_changeFileDialogAct = new QAction(tr("Change Data &File"), this);
_changeFileDialogAct->setStatusTip(tr("Show Kst's Change Data File Dialog"));
+ _changeFileDialogAct->setIcon(QPixmap(":kst_changefile.png"));
connect(_changeFileDialogAct, SIGNAL(triggered()), this, SLOT(showChangeFileDialog()));
_dataWizardAct = new QAction(tr("&Data Wizard"), this);
_dataWizardAct->setStatusTip(tr("Show Kst's Data Wizard"));
+ _dataWizardAct->setIcon(QPixmap(":kst_datawizard.png"));
connect(_dataWizardAct, SIGNAL(triggered()), this, SLOT(showDataWizard()));
// ****************************************************************************** //
@@ -750,6 +753,7 @@
_dataToolBar = addToolBar(tr("Data"));
_dataToolBar->addAction(_dataManagerAct);
+ _dataToolBar->addAction(_dataWizardAct);
// _dataToolBar->addAction(_vectorEditorAct); //no icon
// _dataToolBar->addAction(_scalarEditorAct); //no icon
// _dataToolBar->addAction(_matrixEditorAct); //no icon
@@ -758,11 +762,13 @@
_dataToolBar->addAction(_pauseAct);
_dataToolBar->addAction(_readFromEndAct);
- _viewToolBar = addToolBar(tr("View"));
- _viewToolBar->addAction(_viewManagerAct);
- _viewToolBar->addAction(_tiedZoomAct);
- _viewToolBar->addAction(_layoutModeAct);
+ _layoutToggleToolBar = addToolBar(tr("Mode"));
+ _layoutToggleToolBar->addAction(_layoutModeAct);
+ _zoomToolBar = addToolBar(tr("Zoom"));
+ //_viewToolBar->addAction(_viewManagerAct); // doesn't do anything yet
+ _zoomToolBar->addAction(_tiedZoomAct);
+
_layoutToolBar = new QToolBar(tr("Layout"), this);
_layoutToolBar->addAction(_createLabelAct); //no icon
_layoutToolBar->addAction(_createBoxAct);
@@ -779,6 +785,7 @@
_layoutToolBar->addAction(_createLayoutAct);
_layoutToolBar->addAction(_breakLayoutAct);
_layoutToolBar->setVisible(false);
+ _zoomToolBar->setVisible(true);
addToolBar(Qt::TopToolBarArea, _layoutToolBar);
}
--- branches/work/kst/portto4/kst/src/libkstapp/mainwindow.h #832047:832048
@@ -140,7 +140,8 @@
QMenu *_helpMenu;
QToolBar *_dataToolBar;
- QToolBar *_viewToolBar;
+ QToolBar *_layoutToggleToolBar;
+ QToolBar *_zoomToolBar;
QToolBar *_layoutToolBar;
QAction *_undoAct;
--- branches/work/kst/portto4/kst/src/libkstapp/matrixdialog.cpp #832047:832048
@@ -21,7 +21,6 @@
#include "generatedmatrix.h"
#include "datacollection.h"
-#include "dataobjectcollection.h"
#include "document.h"
#include "objectstore.h"
--- branches/work/kst/portto4/kst/src/libkstapp/plotitem.cpp #832047:832048
@@ -25,7 +25,6 @@
#include "labelrenderer.h"
#include "datacollection.h"
-#include "dataobjectcollection.h"
#include "cartesianrenderitem.h"
#include "plotitemdialog.h"
--- branches/work/kst/portto4/kst/src/libkstapp/powerspectrumdialog.cpp #832047:832048
@@ -14,7 +14,6 @@
#include "application.h"
#include "curve.h"
#include "datacollection.h"
-#include "dataobjectcollection.h"
#include "dialogdefaults.h"
#include "dialogpage.h"
#include "document.h"
--- branches/work/kst/portto4/kst/src/libkstapp/vectordialog.cpp #832047:832048
@@ -19,12 +19,10 @@
#include "generatedvector.h"
#include "datacollection.h"
-#include "dataobjectcollection.h"
#include "document.h"
#include "objectstore.h"
#include "dialogdefaults.h"
-//#include "vectordefaults.h"
#include <QDir>
@@ -375,19 +373,6 @@
Q_ASSERT(_document && _document->objectStore());
-// qDebug() << "Creating new data vector ===>"
-// << "\n\tfileName:" << dataSource->fileName()
-// << "\n\tfileType:" << dataSource->fileType()
-// << "\n\tfield:" << field
-// << "\n\tName:" << Name()
-// << "\n\ttagString:" << tagString()
-// << "\n\tstart:" << (dataRange->countFromEnd() ? -1 : int(dataRange->start()))
-// << "\n\trange:" << (dataRange->readToEnd() ? -1 : int(dataRange->range()))
-// << "\n\tskip:" << dataRange->skip()
-// << "\n\tdoSkip:" << (dataRange->doSkip() ? "true" : "false")
-// << "\n\tdoFilter:" << (dataRange->doFilter() ? "true" : "false")
-// << endl;
-
DataVectorPtr vector = _document->objectStore()->createObject<DataVector>();
vector->writeLock();
@@ -418,13 +403,6 @@
const int numberOfSamples = _vectorTab->numberOfSamples();
Q_ASSERT(_document && _document->objectStore());
-// qDebug() << "Creating new generated vector ===>"
-// << "\n\tfrom:" << from
-// << "\n\tto:" << to
-// << "\n\tnumberOfSamples:" << numberOfSamples
-// << "\n\ttag:" << tag.tag()
-// << endl;
-
Q_ASSERT(_document && _document->objectStore());
GeneratedVectorPtr vector = _document->objectStore()->createObject<GeneratedVector>();
vector->changeRange(from, to, numberOfSamples);
@@ -435,7 +413,6 @@
_dataObjectName = vector->Name();
-// return static_cast<ObjectPtr>(vector);
return vector;
}
--- branches/work/kst/portto4/kst/src/libkstmath/dataobject.cpp #832047:832048
@@ -19,7 +19,6 @@
#include "dataobject.h"
#include "datacollection.h"
-#include "dataobjectcollection.h"
#include "dataobjectplugin.h"
#include "debug.h"
#include "kst_i18n.h"
--- branches/work/kst/portto4/kst/src/libkstmath/libkstmath.pro #832047:832048
@@ -34,7 +34,6 @@
curvehint.cpp \
curvepointsymbol.cpp \
dataobject.cpp \
- dataobjectcollection.cpp \
dialoglauncher.cpp \
emailthread.cpp \
eparse.cpp \
@@ -80,7 +79,6 @@
enodes.h \
eparse-eh.h \
eparse.h \
- dataobjectcollection.h \
dataobject.h \
dataobjectplugin.h \
emailthread.h \
More information about the Kst
mailing list