Menu
▾
▴
scidavis-svn-log
|
From: <hp...@us...> - 2013-12-26 18:25:02
|
Revision: 1379
http://sourceforge.net/p/scidavis/svn/1379
Author: hpcoder
Date: 2013-12-26 18:24:58 +0000 (Thu, 26 Dec 2013)
Log Message:
-----------
brought in auto versioning from Aegis repo
Modified Paths:
--------------
branches/development/scidavis/src/globals.h
Added Paths:
-----------
branches/development/makeVersion.sh
branches/development/scidavis/src/version.cpp
Added: branches/development/makeVersion.sh
===================================================================
--- branches/development/makeVersion.sh (rev 0)
+++ branches/development/makeVersion.sh 2013-12-26 18:24:58 UTC (rev 1379)
@@ -0,0 +1,11 @@
+version=$1
+delta=${version##*.[CD]}
+branch=${version%%.*}
+scidavis_version=$[$branch*65536 + $delta]
+cat >scidavis/src/version.cpp <<EOF
+#include "globals.h"
+const int SciDAVis::scidavis_versionNo = $scidavis_version;
+const char* SciDAVis::scidavis_version = "$version";
+const char * SciDAVis::release_date = "`date +"%b %d, %Y"`";
+EOF
+
Property changes on: branches/development/makeVersion.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/development/scidavis/src/globals.h
===================================================================
--- branches/development/scidavis/src/globals.h 2013-12-25 17:54:19 UTC (rev 1378)
+++ branches/development/scidavis/src/globals.h 2013-12-26 18:24:58 UTC (rev 1379)
@@ -110,9 +110,9 @@
* mm = minor version
* bb = bugfix version
*/
- static const int scidavis_version;
+ static const int scidavis_version
//! Extra version information string (like "-alpha", "-beta", "-rc1", etc...)
- static const char * extra_version;
+ static const char * version;
//! Copyright string containing the author names etc.
static const char * copyright_string;
//! Release date as a string
Added: branches/development/scidavis/src/version.cpp
===================================================================
--- branches/development/scidavis/src/version.cpp (rev 0)
+++ branches/development/scidavis/src/version.cpp 2013-12-26 18:24:58 UTC (rev 1379)
@@ -0,0 +1,2 @@
+const int SciDAVis::scidavis_version = 0x010000;
+const char* SciDAVis::version = "unknown";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dpo...@us...> - 2014-01-23 18:22:23
|
Revision: 1384
http://sourceforge.net/p/scidavis/svn/1384
Author: dpozitron
Date: 2014-01-23 18:22:18 +0000 (Thu, 23 Jan 2014)
Log Message:
-----------
Revert [r1379] "brought in auto versioning from Aegis repo" bad commit
Revision Links:
--------------
http://sourceforge.net/p/scidavis/svn/1379
Modified Paths:
--------------
branches/development/scidavis/src/globals.h
Removed Paths:
-------------
branches/development/makeVersion.sh
branches/development/scidavis/src/version.cpp
Deleted: branches/development/makeVersion.sh
===================================================================
--- branches/development/makeVersion.sh 2014-01-23 06:32:45 UTC (rev 1383)
+++ branches/development/makeVersion.sh 2014-01-23 18:22:18 UTC (rev 1384)
@@ -1,11 +0,0 @@
-version=$1
-delta=${version##*.[CD]}
-branch=${version%%.*}
-scidavis_version=$[$branch*65536 + $delta]
-cat >scidavis/src/version.cpp <<EOF
-#include "globals.h"
-const int SciDAVis::scidavis_versionNo = $scidavis_version;
-const char* SciDAVis::scidavis_version = "$version";
-const char * SciDAVis::release_date = "`date +"%b %d, %Y"`";
-EOF
-
Modified: branches/development/scidavis/src/globals.h
===================================================================
--- branches/development/scidavis/src/globals.h 2014-01-23 06:32:45 UTC (rev 1383)
+++ branches/development/scidavis/src/globals.h 2014-01-23 18:22:18 UTC (rev 1384)
@@ -110,9 +110,9 @@
* mm = minor version
* bb = bugfix version
*/
- static const int scidavis_version
+ static const int scidavis_version;
//! Extra version information string (like "-alpha", "-beta", "-rc1", etc...)
- static const char * version;
+ static const char * extra_version;
//! Copyright string containing the author names etc.
static const char * copyright_string;
//! Release date as a string
Deleted: branches/development/scidavis/src/version.cpp
===================================================================
--- branches/development/scidavis/src/version.cpp 2014-01-23 06:32:45 UTC (rev 1383)
+++ branches/development/scidavis/src/version.cpp 2014-01-23 18:22:18 UTC (rev 1384)
@@ -1,2 +0,0 @@
-const int SciDAVis::scidavis_version = 0x010000;
-const char* SciDAVis::version = "unknown";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hp...@us...> - 2014-01-24 10:48:07
|
Revision: 1389
http://sourceforge.net/p/scidavis/svn/1389
Author: hpcoder
Date: 2014-01-24 10:48:04 +0000 (Fri, 24 Jan 2014)
Log Message:
-----------
Added back in the release versioning system, but also added a x.y.z
schema version function suitable for use within the project file
writer. This solves ticket #228.
Modified Paths:
--------------
branches/development/scidavis/icons/scidavis-splash.png
branches/development/scidavis/icons/scidavis-splash.xcf
branches/development/scidavis/sourcefiles.pri
branches/development/scidavis/src/ApplicationWindow.cpp
branches/development/scidavis/src/globals.cpp
branches/development/scidavis/src/globals.h
Added Paths:
-----------
branches/development/makeVersion.sh
branches/development/scidavis/src/version.cpp
Added: branches/development/makeVersion.sh
===================================================================
--- branches/development/makeVersion.sh (rev 0)
+++ branches/development/makeVersion.sh 2014-01-24 10:48:04 UTC (rev 1389)
@@ -0,0 +1,19 @@
+version=$1
+delta=${version##*.[CD]}
+branch=${version%%.*}
+scidavis_version=$[$branch*65536 + $delta]
+cat >scidavis/src/version.cpp <<EOF
+#include "globals.h"
+const int SciDAVis::scidavis_versionNo = $scidavis_version;
+const char* SciDAVis::scidavis_version = "$version";
+const char * SciDAVis::release_date = "`date +"%b %d, %Y"`";
+EOF
+
+# also check that all translation files have been included
+for i in scidavis/translations/*.ts; do
+ if aels -terse $i |grep -- \--- >/dev/null; then
+ echo "translation $i not checked in"
+ exit 1
+ fi
+done
+
Property changes on: branches/development/makeVersion.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/development/scidavis/icons/scidavis-splash.png
===================================================================
(Binary files differ)
Modified: branches/development/scidavis/icons/scidavis-splash.xcf
===================================================================
(Binary files differ)
Modified: branches/development/scidavis/sourcefiles.pri
===================================================================
--- branches/development/scidavis/sourcefiles.pri 2014-01-23 19:45:52 UTC (rev 1388)
+++ branches/development/scidavis/sourcefiles.pri 2014-01-24 10:48:04 UTC (rev 1389)
@@ -38,7 +38,9 @@
unix: tstarget.target = translations/scidavis_de.qm
win32: tstarget.target = translations\scidavis_de.qm
- tstarget.commands = $$LUPDATE_BIN scidavis.pro && $$LRELEASE_BIN scidavis.pro
+# note the translation files are not writable during AEGIS
+# integration, so we don't want to perform an update then
+ tstarget.commands = (! test -w translations/scidavis_de.ts || $$LUPDATE_BIN scidavis.pro) && $$LRELEASE_BIN scidavis.pro
QMAKE_EXTRA_TARGETS += tstarget
PRE_TARGETDEPS += translations/scidavis_de.qm
@@ -312,6 +314,7 @@
src/TeXTableSettings.cpp \
src/TeXTableSettingsWidget.cpp \
src/TeXTableExportDialog.cpp \
+ src/version.cpp \
###################### FORMS ##############################################
FORMS += src/SciDAVisAbout.ui
Modified: branches/development/scidavis/src/ApplicationWindow.cpp
===================================================================
--- branches/development/scidavis/src/ApplicationWindow.cpp 2014-01-23 19:45:52 UTC (rev 1388)
+++ branches/development/scidavis/src/ApplicationWindow.cpp 2014-01-24 10:48:04 UTC (rev 1389)
@@ -12364,7 +12364,7 @@
QTextStream t( &f );
t.setEncoding(QTextStream::UnicodeUTF8);
- t << SciDAVis::versionString() + " project file\n";
+ t << SciDAVis::schemaVersion() + " project file\n";
t << "<scripting-lang>\t"+QString(scriptEnv->name())+"\n";
t << "<windows>\t"+QString::number(folder->windowCount(true))+"\n";
t.flush();
Modified: branches/development/scidavis/src/globals.cpp
===================================================================
--- branches/development/scidavis/src/globals.cpp 2014-01-23 19:45:52 UTC (rev 1388)
+++ branches/development/scidavis/src/globals.cpp 2014-01-24 10:48:04 UTC (rev 1389)
@@ -38,7 +38,6 @@
// Don't forget to change the Doxyfile, the splash screen and the Windows
// installer when changing these!
-const int SciDAVis::scidavis_version = 0x000204;
const char * SciDAVis::extra_version = "";
@@ -50,7 +49,7 @@
The following people have written parts of the SciDAVis source code, ranging from a few lines to large chunks.\n\
In alphabetical order.\n\
\n\
-Tilman Benkert[1], Knut Franke\n\
+Tilman Benkert[1], Knut Franke, Dmitriy Pozitron, Russell Standish\n\
\n\
--- Documentation ---\n\
\n\
@@ -66,7 +65,7 @@
\n\
Tilman Benkert[1], Markus Bongard, Tobias Burnus, R\xE9my Claverie, f0ma, Jos\xE9 Antonio Lorenzo Fern\xE1ndez, \
Pavel Fric, Jan Helebrant, Daniel Klaer, Peter Landgren, Fellype do Nascimento, Tomomasa Ohkubo, \
-Mikhail Shevyakov, Mauricio Troviano\n\
+Mikhail Shevyakov, Russell Standish, Mauricio Troviano\n\
\n\
--- Packagers ---\n\
\n\
@@ -109,19 +108,22 @@
\n\
... and many more we just forgot to mention.\n";
-const char * SciDAVis::release_date = " 2010-03-12";
-
int SciDAVis::version()
{
- return scidavis_version;
+ return scidavis_versionNo;
}
+QString SciDAVis::schemaVersion()
+{
+ return "SciDAVis " +
+ QString::number((version() & 0xFF0000) >> 16)+"."+
+ QString::number((version() & 0x00FF00) >> 8)+"."+
+ QString::number(version() & 0x0000FF);
+}
+
QString SciDAVis::versionString()
{
- return "SciDAVis " +
- QString::number((scidavis_version & 0xFF0000) >> 16)+"."+
- QString::number((scidavis_version & 0x00FF00) >> 8)+"."+
- QString::number(scidavis_version & 0x0000FF);
+ return QString("SciDAVis ") + scidavis_version;
}
QString SciDAVis::extraVersion()
Modified: branches/development/scidavis/src/globals.h
===================================================================
--- branches/development/scidavis/src/globals.h 2014-01-23 19:45:52 UTC (rev 1388)
+++ branches/development/scidavis/src/globals.h 2014-01-24 10:48:04 UTC (rev 1389)
@@ -86,7 +86,9 @@
static QString enumValueToString(int key, const QString& enum_name);
static int enumStringToValue(const QString& string, const QString& enum_name);
- //! Return the SciDAVis version string ("SciDAVis x.y.z" without extra version)
+ //! Return the SciDAVis version string ("SciDAVis x.y.z" without extra version) used in the project file
+ static QString schemaVersion();
+ /// the user visible release version string (x.Dy usually)
static QString versionString();
//! Return the extra version as a string
@@ -110,7 +112,8 @@
* mm = minor version
* bb = bugfix version
*/
- static const int scidavis_version;
+ static const int scidavis_versionNo;
+ static const char* scidavis_version;
//! Extra version information string (like "-alpha", "-beta", "-rc1", etc...)
static const char * extra_version;
//! Copyright string containing the author names etc.
Added: branches/development/scidavis/src/version.cpp
===================================================================
--- branches/development/scidavis/src/version.cpp (rev 0)
+++ branches/development/scidavis/src/version.cpp 2014-01-24 10:48:04 UTC (rev 1389)
@@ -0,0 +1,4 @@
+#include "globals.h"
+const int SciDAVis::scidavis_versionNo = 65538;
+const char* SciDAVis::scidavis_version = "1.D002";
+const char * SciDAVis::release_date = "Jan 24, 2014";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hp...@us...> - 2014-01-25 08:58:03
|
Revision: 1396
http://sourceforge.net/p/scidavis/svn/1396
Author: hpcoder
Date: 2014-01-25 08:58:01 +0000 (Sat, 25 Jan 2014)
Log Message:
-----------
Fixed makeVersion script to handle integration environment
Modified Paths:
--------------
branches/development/makeVersion.sh
branches/development/scidavis/src/version.cpp
Modified: branches/development/makeVersion.sh
===================================================================
--- branches/development/makeVersion.sh 2014-01-24 22:09:38 UTC (rev 1395)
+++ branches/development/makeVersion.sh 2014-01-25 08:58:01 UTC (rev 1396)
@@ -2,6 +2,7 @@
delta=${version##*.[CD]}
branch=${version%%.*}
scidavis_version=$[$branch*65536 + $delta]
+rm -f scidavis/src/version.cpp
cat >scidavis/src/version.cpp <<EOF
#include "globals.h"
const int SciDAVis::scidavis_versionNo = $scidavis_version;
Modified: branches/development/scidavis/src/version.cpp
===================================================================
--- branches/development/scidavis/src/version.cpp 2014-01-24 22:09:38 UTC (rev 1395)
+++ branches/development/scidavis/src/version.cpp 2014-01-25 08:58:01 UTC (rev 1396)
@@ -1,4 +1,4 @@
#include "globals.h"
-const int SciDAVis::scidavis_versionNo = 65538;
-const char* SciDAVis::scidavis_version = "1.D002";
-const char * SciDAVis::release_date = "Jan 24, 2014";
+const int SciDAVis::scidavis_versionNo = 65540;
+const char* SciDAVis::scidavis_version = "1.D004";
+const char * SciDAVis::release_date = "Jan 25, 2014";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dpo...@us...> - 2014-01-25 12:34:44
|
Revision: 1398
http://sourceforge.net/p/scidavis/svn/1398
Author: dpozitron
Date: 2014-01-25 12:34:39 +0000 (Sat, 25 Jan 2014)
Log Message:
-----------
Fighting with warnings
Modified Paths:
--------------
branches/development/3rdparty/minigzip/minigzip.c
branches/development/scidavis/src/ApplicationWindow.cpp
branches/development/scidavis/src/ExpDecayDialog.cpp
branches/development/scidavis/src/FilterDialog.cpp
branches/development/scidavis/src/FitDialog.cpp
branches/development/scidavis/src/Graph.h
branches/development/scidavis/src/InterpolationDialog.cpp
branches/development/scidavis/src/LayerDialog.cpp
branches/development/scidavis/src/LineDialog.cpp
branches/development/scidavis/src/MuParserScripting.h
branches/development/scidavis/src/PatternBox.h
branches/development/scidavis/src/PlotDialog.cpp
branches/development/scidavis/src/PolynomFitDialog.cpp
branches/development/scidavis/src/SymbolBox.h
Modified: branches/development/3rdparty/minigzip/minigzip.c
===================================================================
--- branches/development/3rdparty/minigzip/minigzip.c 2014-01-25 09:11:19 UTC (rev 1397)
+++ branches/development/3rdparty/minigzip/minigzip.c 2014-01-25 12:34:39 UTC (rev 1398)
@@ -108,7 +108,7 @@
int gz_compress_mmap OF((FILE *in, gzFile out));
#endif
void gz_uncompress OF((gzFile in, FILE *out));
-void file_compress OF((char *file, char *mode));
+void file_compress OF((const char *file, const char *mode));
void file_uncompress OF((char *file));
int main OF((int argc, char *argv[]));
@@ -222,8 +222,8 @@
* original.
*/
void file_compress(file, mode)
- char *file;
- char *mode;
+ const char *file;
+ const char *mode;
{
local char outfile[MAX_NAME_LEN];
FILE *in;
Modified: branches/development/scidavis/src/ApplicationWindow.cpp
===================================================================
--- branches/development/scidavis/src/ApplicationWindow.cpp 2014-01-25 09:11:19 UTC (rev 1397)
+++ branches/development/scidavis/src/ApplicationWindow.cpp 2014-01-25 12:34:39 UTC (rev 1398)
@@ -167,7 +167,7 @@
extern "C"
{
-void file_compress(char *file, char *mode);
+void file_compress(const char *file, const char *mode);
}
ApplicationWindow::ApplicationWindow()
Modified: branches/development/scidavis/src/ExpDecayDialog.cpp
===================================================================
--- branches/development/scidavis/src/ExpDecayDialog.cpp 2014-01-25 09:11:19 UTC (rev 1397)
+++ branches/development/scidavis/src/ExpDecayDialog.cpp 2014-01-25 12:34:39 UTC (rev 1398)
@@ -110,7 +110,7 @@
gl1->addWidget(boxStart, 5, 1);
gl1->addWidget(new QLabel(tr("Color")), 6, 0 );
- boxColor = new ColorBox(false);
+ boxColor = new ColorBox();
boxColor->setColor(QColor(Qt::red));
gl1->addWidget(boxColor, 6, 1);
Modified: branches/development/scidavis/src/FilterDialog.cpp
===================================================================
--- branches/development/scidavis/src/FilterDialog.cpp 2014-01-25 09:11:19 UTC (rev 1397)
+++ branches/development/scidavis/src/FilterDialog.cpp 2014-01-25 12:34:39 UTC (rev 1398)
@@ -63,7 +63,7 @@
boxStart->setText(tr("0"));
gl1->addWidget(boxStart, 1, 1);
- boxColor = new ColorBox(false);
+ boxColor = new ColorBox();
boxColor->setColor(QColor(Qt::red));
if (type >= FFTFilter::BandPass)
{
Modified: branches/development/scidavis/src/FitDialog.cpp
===================================================================
--- branches/development/scidavis/src/FitDialog.cpp 2014-01-25 09:11:19 UTC (rev 1397)
+++ branches/development/scidavis/src/FitDialog.cpp 2014-01-25 12:34:39 UTC (rev 1398)
@@ -132,7 +132,7 @@
gl1->addWidget(boxAlgorithm, 4, 1);
gl1->addWidget(new QLabel( tr("Color")), 5, 0);
- boxColor = new ColorBox( false );
+ boxColor = new ColorBox();
boxColor->setColor(QColor(Qt::red));
gl1->addWidget(boxColor, 5, 1);
Modified: branches/development/scidavis/src/Graph.h
===================================================================
--- branches/development/scidavis/src/Graph.h 2014-01-25 09:11:19 UTC (rev 1397)
+++ branches/development/scidavis/src/Graph.h 2014-01-25 12:34:39 UTC (rev 1398)
@@ -189,7 +189,7 @@
double selectedXEndValue();
long curveKey(int curve){return c_keys[curve];}
- int curveIndex(long key){return c_keys.indexOf(key);};
+ int curveIndex(long key) const {return c_keys.indexOf(key);}
//! Map curve pointer to index.
int curveIndex(QwtPlotCurve *c) const;
//! map curve title to index
Modified: branches/development/scidavis/src/InterpolationDialog.cpp
===================================================================
--- branches/development/scidavis/src/InterpolationDialog.cpp 2014-01-25 09:11:19 UTC (rev 1397)
+++ branches/development/scidavis/src/InterpolationDialog.cpp 2014-01-25 12:34:39 UTC (rev 1398)
@@ -78,7 +78,7 @@
gl1->addWidget(new QLabel(tr("Color")), 5, 0);
- boxColor = new ColorBox(false);
+ boxColor = new ColorBox();
boxColor->setColor(QColor(Qt::red));
gl1->addWidget(boxColor, 5, 1);
gl1->setRowStretch(6, 1);
Modified: branches/development/scidavis/src/LayerDialog.cpp
===================================================================
--- branches/development/scidavis/src/LayerDialog.cpp 2014-01-25 09:11:19 UTC (rev 1397)
+++ branches/development/scidavis/src/LayerDialog.cpp 2014-01-25 12:34:39 UTC (rev 1398)
@@ -61,14 +61,14 @@
QGridLayout *gl2 = new QGridLayout(gb2);
gl2->addWidget(new QLabel(tr("Horizontal")), 0, 0);
- alignHorBox = new QComboBox( false );
+ alignHorBox = new QComboBox();
alignHorBox->insertItem( tr( "Center" ) );
alignHorBox->insertItem( tr( "Left" ) );
alignHorBox->insertItem( tr( "Right" ) );
gl2->addWidget(alignHorBox, 0, 1);
gl2->addWidget(new QLabel( tr( "Vertical" )), 1, 0 );
- alignVertBox = new QComboBox( false );
+ alignVertBox = new QComboBox();
alignVertBox->insertItem( tr( "Center" ) );
alignVertBox->insertItem( tr( "Top" ) );
alignVertBox->insertItem( tr( "Bottom" ) );
Modified: branches/development/scidavis/src/LineDialog.cpp
===================================================================
--- branches/development/scidavis/src/LineDialog.cpp 2014-01-25 09:11:19 UTC (rev 1397)
+++ branches/development/scidavis/src/LineDialog.cpp 2014-01-25 12:34:39 UTC (rev 1398)
@@ -63,7 +63,7 @@
gl1->addWidget(colorBox, 0, 1);
gl1->addWidget(new QLabel(tr("Line type")), 1, 0);
- styleBox = new QComboBox( FALSE);
+ styleBox = new QComboBox();
styleBox->insertItem("_____");
styleBox->insertItem("- - -");
styleBox->insertItem(".....");
@@ -74,7 +74,7 @@
setLineStyle(lm->style());
gl1->addWidget(new QLabel(tr("Line width")), 2, 0);
- widthBox = new QComboBox( FALSE );
+ widthBox = new QComboBox();
widthBox->insertItem( tr( "1" ) );
widthBox->insertItem( tr( "2" ) );
widthBox->insertItem( tr( "3" ) );
Modified: branches/development/scidavis/src/MuParserScripting.h
===================================================================
--- branches/development/scidavis/src/MuParserScripting.h 2014-01-25 09:11:19 UTC (rev 1397)
+++ branches/development/scidavis/src/MuParserScripting.h 2014-01-25 12:34:39 UTC (rev 1398)
@@ -71,7 +71,7 @@
struct mathFunction
{
- char *name;
+ const char *name;
int numargs;
double (*fun1)(double);
double (*fun2)(double,double);
Modified: branches/development/scidavis/src/PatternBox.h
===================================================================
--- branches/development/scidavis/src/PatternBox.h 2014-01-25 09:11:19 UTC (rev 1397)
+++ branches/development/scidavis/src/PatternBox.h 2014-01-25 12:34:39 UTC (rev 1398)
@@ -36,8 +36,8 @@
{
Q_OBJECT
public:
- PatternBox(bool rw, QWidget *parent);
- PatternBox(QWidget *parent);
+ PatternBox(bool rw, QWidget *parent = 0);
+ PatternBox(QWidget *parent = 0);
void setPattern(const Qt::BrushStyle& c);
Qt::BrushStyle getSelectedPattern() const;
Modified: branches/development/scidavis/src/PlotDialog.cpp
===================================================================
--- branches/development/scidavis/src/PlotDialog.cpp 2014-01-25 09:11:19 UTC (rev 1397)
+++ branches/development/scidavis/src/PlotDialog.cpp 2014-01-25 12:34:39 UTC (rev 1398)
@@ -377,11 +377,11 @@
QGridLayout *gl1 = new QGridLayout();
gl1->addWidget(new QLabel( tr( "Color" )), 0, 0);
- boxPieLineColor = new ColorBox(false);
+ boxPieLineColor = new ColorBox();
gl1->addWidget(boxPieLineColor, 0, 1);
gl1->addWidget(new QLabel(tr( "Style" )), 1, 0);
- boxPieLineStyle = new QComboBox( false );
+ boxPieLineStyle = new QComboBox();
boxPieLineStyle->insertItem("_____");
boxPieLineStyle->insertItem("- - -");
boxPieLineStyle->insertItem(".....");
@@ -400,11 +400,11 @@
QGridLayout *gl2 = new QGridLayout();
gl2->addWidget(new QLabel( tr( "First color" )), 0, 0);
- boxFirstColor = new ColorBox(false);
+ boxFirstColor = new ColorBox();
gl2->addWidget(boxFirstColor, 0, 1);
gl2->addWidget(new QLabel( tr( "Pattern" )), 1, 0);
- boxPiePattern = new PatternBox(false);
+ boxPiePattern = new PatternBox();
gl2->addWidget(boxPiePattern, 1, 1);
gl2->addWidget(new QLabel( tr( "Pie radius" )), 2, 0);
@@ -500,7 +500,7 @@
gl1->addWidget(boxLineWidth, 2, 1);
gl1->addWidget(new QLabel(tr( "Color" )), 3, 0);
- boxLineColor = new ColorBox( false);
+ boxLineColor = new ColorBox();
gl1->addWidget(boxLineColor, 3, 1);
gl1->setRowStretch (4, 1);
@@ -508,10 +508,10 @@
fillGroupBox->setCheckable(true);
QGridLayout *gl2 = new QGridLayout(fillGroupBox);
gl2->addWidget(new QLabel(tr( "Fill color" )), 0, 0);
- boxAreaColor = new ColorBox(false);
+ boxAreaColor = new ColorBox();
gl2->addWidget(boxAreaColor, 0, 1);
gl2->addWidget(new QLabel(tr( "Pattern" )), 1, 0);
- boxPattern = new PatternBox(false);
+ boxPattern = new PatternBox();
gl2->addWidget(boxPattern, 1, 1);
gl2->setRowStretch (2, 1);
@@ -535,7 +535,7 @@
QGroupBox *gb = new QGroupBox();
QGridLayout *gl = new QGridLayout(gb);
gl->addWidget(new QLabel(tr( "Style" )), 0, 0);
- boxSymbolStyle = new SymbolBox(false);
+ boxSymbolStyle = new SymbolBox();
gl->addWidget(boxSymbolStyle, 0, 1);
gl->addWidget(new QLabel(tr( "Size" )), 1, 0);
boxSymbolSize = new QSpinBox();
@@ -544,10 +544,10 @@
gl->addWidget(boxSymbolSize, 1, 1);
boxFillSymbol = new QCheckBox( tr( "Fill Color" ));
gl->addWidget(boxFillSymbol, 2, 0);
- boxFillColor = new ColorBox(false);
+ boxFillColor = new ColorBox();
gl->addWidget(boxFillColor, 2, 1);
gl->addWidget(new QLabel(tr( "Edge Color" )), 3, 0);
- boxSymbolColor = new ColorBox( false);
+ boxSymbolColor = new ColorBox();
gl->addWidget(boxSymbolColor, 3, 1);
gl->addWidget(new QLabel(tr( "Edge Width" )), 4, 0);
boxPenWidth = new QSpinBox();
@@ -675,23 +675,23 @@
QGridLayout *gl1 = new QGridLayout(gb1);
gl1->addWidget(new QLabel(tr( "Max" )), 0, 0);
- boxMaxStyle = new SymbolBox(false);
+ boxMaxStyle = new SymbolBox();
gl1->addWidget(boxMaxStyle, 0, 1);
gl1->addWidget(new QLabel(tr( "99%" )), 1, 0);
- box99Style = new SymbolBox(false);
+ box99Style = new SymbolBox();
gl1->addWidget(box99Style, 1, 1);
gl1->addWidget(new QLabel(tr( "Mean" )), 2, 0);
- boxMeanStyle = new SymbolBox( false);
+ boxMeanStyle = new SymbolBox();
gl1->addWidget(boxMeanStyle, 2, 1);
gl1->addWidget(new QLabel(tr( "1%" )), 3, 0);
- box1Style = new SymbolBox(false);
+ box1Style = new SymbolBox();
gl1->addWidget(box1Style, 3, 1);
gl1->addWidget(new QLabel(tr( "Min" )), 4, 0);
- boxMinStyle = new SymbolBox(false);
+ boxMinStyle = new SymbolBox();
gl1->addWidget(boxMinStyle, 4, 1);
gl1->setRowStretch(5, 1);
@@ -705,11 +705,11 @@
boxFillSymbols = new QCheckBox(tr( "Fill Color" ));
gl2->addWidget(boxFillSymbols, 1, 0);
- boxPercFillColor = new ColorBox(false);
+ boxPercFillColor = new ColorBox();
gl2->addWidget(boxPercFillColor, 1, 1);
gl2->addWidget(new QLabel(tr( "Edge Color" )), 2, 0);
- boxEdgeColor = new ColorBox(false);
+ boxEdgeColor = new ColorBox();
gl2->addWidget(boxEdgeColor, 2, 1);
gl2->addWidget(new QLabel(tr( "Edge Width" )), 3, 0);
@@ -962,7 +962,7 @@
QGroupBox *gb1 = new QGroupBox();
QGridLayout *gl1 = new QGridLayout(gb1);
gl1->addWidget(new QLabel(tr( "Color" )), 0, 0);
- vectColorBox = new ColorBox(false);
+ vectColorBox = new ColorBox();
gl1->addWidget(vectColorBox, 0, 1);
gl1->addWidget(new QLabel(tr( "Line Width" )), 1, 0);
vectWidthBox = new QSpinBox();
@@ -988,17 +988,17 @@
QGridLayout *gl3 = new QGridLayout(GroupBoxVectEnd);
labelXEnd = new QLabel(tr( "X End" ));
gl3->addWidget(labelXEnd, 0, 0);
- xEndBox = new QComboBox(false);
+ xEndBox = new QComboBox();
gl3->addWidget(xEndBox, 0, 1);
labelYEnd = new QLabel(tr( "Y End" ));
gl3->addWidget(labelYEnd, 1, 0);
- yEndBox = new QComboBox( false);
+ yEndBox = new QComboBox();
gl3->addWidget(yEndBox, 1, 1);
labelPosition = new QLabel(tr( "Position" ));
gl3->addWidget(labelPosition, 2, 0);
- vectPosBox = new QComboBox( false);
+ vectPosBox = new QComboBox();
vectPosBox->addItem(tr("Tail"));
vectPosBox->addItem(tr("Middle"));
vectPosBox->addItem(tr("Head"));
Modified: branches/development/scidavis/src/PolynomFitDialog.cpp
===================================================================
--- branches/development/scidavis/src/PolynomFitDialog.cpp 2014-01-25 09:11:19 UTC (rev 1397)
+++ branches/development/scidavis/src/PolynomFitDialog.cpp 2014-01-25 12:34:39 UTC (rev 1398)
@@ -70,7 +70,7 @@
gl1->addWidget(boxEnd, 3, 1);
gl1->addWidget(new QLabel( tr("Color")), 4, 0);
- boxColor = new ColorBox( false);
+ boxColor = new ColorBox();
boxColor->setColor(QColor(Qt::red));
gl1->addWidget(boxColor, 4, 1);
Modified: branches/development/scidavis/src/SymbolBox.h
===================================================================
--- branches/development/scidavis/src/SymbolBox.h 2014-01-25 09:11:19 UTC (rev 1397)
+++ branches/development/scidavis/src/SymbolBox.h 2014-01-25 12:34:39 UTC (rev 1398)
@@ -37,8 +37,8 @@
{
Q_OBJECT
public:
- SymbolBox(bool rw, QWidget *parent);
- SymbolBox(QWidget *parent);
+ SymbolBox(bool rw, QWidget *parent = 0);
+ SymbolBox(QWidget *parent = 0);
void setStyle(const QwtSymbol::Style& c);
QwtSymbol::Style selectedSymbol() const;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hp...@us...> - 2014-01-29 06:02:58
|
Revision: 1403
http://sourceforge.net/p/scidavis/svn/1403
Author: hpcoder
Date: 2014-01-29 06:02:55 +0000 (Wed, 29 Jan 2014)
Log Message:
-----------
Macintosh installer stuff
Modified Paths:
--------------
branches/development/README.installer
branches/development/scidavis/scidavis.pro
branches/development/scidavis/src/ScriptEdit.h
Added Paths:
-----------
branches/development/mkMacDist.sh
Modified: branches/development/README.installer
===================================================================
--- branches/development/README.installer 2014-01-29 03:38:48 UTC (rev 1402)
+++ branches/development/README.installer 2014-01-29 06:02:55 UTC (rev 1403)
@@ -35,3 +35,28 @@
4) Right click on scidavisScriptInstall.nsi and select compile.
+Creating a MacOS installable package:
+
+1. You should use the MacPorts system to provide the software
+dependencies (http://www.macports.org). It takes a while to install,
+but it auto configures dependencies of dependencies, so it is quicker
+that trying to do it from generic source code.
+
+2. Issue a qmake PRESET=mac_dist, which sets everything up to use the
+MacPorts stuff
+
+3. make
+
+This should create a clickable application directory scidavis/scidavis.app
+
+4. Run the script mkMacDist.sh. This copies all the dependent
+dynamic libraries from the MacPorts install location (/opt/local) into
+the scidavis.app directory, and rewrites the load paths in the dynamic
+load modules. This is currently horribly fragile, as updates to the
+dependencies will change their names, causing this script to
+fail. You can use "otool -L " to diagnose what's going on, and you
+need a test system (eg virtual machine) without the MacPorts stuff
+installed to make sure everything is working. Someday, it might be
+nice to work out an automated approach to all of this.
+
+5. mkMacDist will create a .pkg file, for distribution.
Added: branches/development/mkMacDist.sh
===================================================================
--- branches/development/mkMacDist.sh (rev 0)
+++ branches/development/mkMacDist.sh 2014-01-29 06:02:55 UTC (rev 1403)
@@ -0,0 +1,65 @@
+#!/bin/bash
+# Create a distributable installable package
+
+DIST_DIR=scidavis/scidavis.app/Contents/MacOS
+RES_DIR=scidavis/scidavis.app/Contents/Resources
+
+# We to copy all dynamic libraries, and rewrite the absolute link paths to be
+# relative
+for i in libqwt.5.dylib libqwtplot3d.0.dylib libmuparser.0.dylib QtAssistant.framework/Versions/4/QtAssistant libz.1.dylib libssl.1.0.0.dylib libcrypto.1.0.0.dylib libpng16.16.dylib; do
+ cp -f /opt/local/lib/$i $DIST_DIR
+ install_name_tool -change /opt/local/lib/$i @executable_path/${i##*/} $DIST_DIR/scidavis
+done
+
+# and same for Framework dylibs
+for i in Python.framework/Versions/2.7/Python QtCore.framework/Versions/4/QtCore QtNetwork.framework/Versions/4/QtNetwork QtSvg.framework/Versions/4/QtSvg Qt3Support.framework/Versions/4/Qt3Support QtSql.framework/Versions/4/QtSql QtXml.framework/Versions/4/QtXml QtOpenGL.framework/Versions/4/QtOpenGL QtGui.framework/Versions/4/QtGui; do
+ cp -f /opt/local/Library/Frameworks/$i $DIST_DIR
+ install_name_tool -change /opt/local/Library/Frameworks/$i @executable_path/${i##*/} $DIST_DIR/scidavis
+done
+
+chmod u+w $DIST_DIR/*
+
+# finally rewrite references contained within the dylibs themselves
+for i in Qt3Support.framework/Versions/4/Qt3Support QtGui.framework/Versions/4/QtGui QtCore.framework/Versions/4/QtCore QtSql.framework/Versions/4/QtSql QtXml.framework/Versions/4/QtXml QtNetwork.framework/Versions/4/QtNetwork QtOpenGL.framework/Versions/4/QtOpenGL; do
+ for j in $DIST_DIR/*; do
+ install_name_tool -change /opt/local/Library/Frameworks/$i @executable_path/${i##*/} $j
+ done
+done
+
+for i in libz.1.dylib libssl.1.0.0.dylib libcrypto.1.0.0.dylib libpng16.16.dylib; do
+ for j in $DIST_DIR/*; do
+ install_name_tool -change /opt/local/lib/$i @executable_path/${i##*/} $j
+ done
+done
+
+# Generic resources required for Qt
+cp -r /opt/local/Library/Frameworks/QtGui.framework/Resources/qt_menu.nib $RES_DIR
+
+# copy icon, and create mainfest
+cp -f scidavis/icons/scidavis.icns $RES_DIR
+cat >scidavis/scidavis.app/Contents/Info.plist <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
+ "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>NSPrincipalClass</key>
+ <string>NSApplication</string>
+ <key>CFBundleIconFile</key>
+ <string>scidavis.icns</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleGetInfoString</key>
+ <string>Created by Qt/QMake</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleExecutable</key>
+ <string>scidavis</string>
+ <key>CFBundleIdentifier</key>
+ <string>net.sourceforge.scidavis</string>
+</dict>
+</plist>
+EOF
+
+pkgbuild --root scidavis/scidavis.app --install-location /Applications/scidavis.app --identifier SciDAVis scidavis.pkg
+
Property changes on: branches/development/mkMacDist.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/development/scidavis/scidavis.pro
===================================================================
--- branches/development/scidavis/scidavis.pro 2014-01-29 03:38:48 UTC (rev 1402)
+++ branches/development/scidavis/scidavis.pro 2014-01-29 06:02:55 UTC (rev 1403)
@@ -216,6 +216,31 @@
}
}
+contains(PRESET, mac_dist) {
+ # Uses MacPorts supplied versions of the dependencies
+
+ INCLUDEPATH += /opt/local/include
+ INCLUDEPATH += /opt/local/include/qwt
+
+ LIBS += -L/opt/local/lib -lqwt
+
+ INCLUDEPATH += /opt/local/include/qwtplot3d
+ LIBS += -lqwtplot3d
+
+ INCLUDEPATH += /opt/local/include/muParser
+ LIBS += -lgsl -lgslcblas -lz
+ LIBS += -lmuparser -lpython2.7
+
+ contains(DEFINES, ORIGIN_IMPORT) {
+ LIBS += -lorigin
+ INCLUDEPATH += /usr/include/liborigin
+ }
+
+ QMAKE_EXTRA_TARGETS += mac-dist
+ mac-dist.commands = sh mkMacDist.sh
+
+}
+
contains(PRESET, linux_package) {
### dynamically link against Qwt(3D) installed system-wide
### WARNING: make sure they are compiled against >= Qt4.2
Modified: branches/development/scidavis/src/ScriptEdit.h
===================================================================
--- branches/development/scidavis/src/ScriptEdit.h 2014-01-29 03:38:48 UTC (rev 1402)
+++ branches/development/scidavis/src/ScriptEdit.h 2014-01-29 06:02:55 UTC (rev 1403)
@@ -52,7 +52,7 @@
public:
//! Constructor.
- ScriptEdit(ScriptingEnv *env, QWidget *parent=0, QString name=0);
+ ScriptEdit(ScriptingEnv *env, QWidget *parent=0, QString name="");
//! Handle changing of scripting environment.
void customEvent(QEvent*);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hp...@us...> - 2014-02-11 03:47:54
|
Revision: 1413
http://sourceforge.net/p/scidavis/svn/1413
Author: hpcoder
Date: 2014-02-11 03:47:49 +0000 (Tue, 11 Feb 2014)
Log Message:
-----------
Add automated version information to Doxyfile
Modified Paths:
--------------
branches/development/Doxyfile
branches/development/makeVersion.sh
Added Paths:
-----------
branches/development/Doxyversion
Modified: branches/development/Doxyfile
===================================================================
--- branches/development/Doxyfile 2014-02-09 06:37:57 UTC (rev 1412)
+++ branches/development/Doxyfile 2014-02-11 03:47:49 UTC (rev 1413)
@@ -2,7 +2,8 @@
# Project related configuration options
#---------------------------------------------------------------------------
PROJECT_NAME = SciDAVis
-PROJECT_NUMBER = 0.2.4
+#PROJECT_NUMBER = 1.D4
+@INCLUDE = Doxyversion
OUTPUT_DIRECTORY = API
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
Added: branches/development/Doxyversion
===================================================================
--- branches/development/Doxyversion (rev 0)
+++ branches/development/Doxyversion 2014-02-11 03:47:49 UTC (rev 1413)
@@ -0,0 +1 @@
+PROJECT_NUMBER=1.D4
Modified: branches/development/makeVersion.sh
===================================================================
--- branches/development/makeVersion.sh 2014-02-09 06:37:57 UTC (rev 1412)
+++ branches/development/makeVersion.sh 2014-02-11 03:47:49 UTC (rev 1413)
@@ -18,3 +18,5 @@
fi
done
+# update Doxyversion
+echo "PROJECT_NUMBER=$version" >Doxyversion
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hp...@us...> - 2014-02-14 23:35:26
|
Revision: 1416
http://sourceforge.net/p/scidavis/svn/1416
Author: hpcoder
Date: 2014-02-14 23:35:24 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------
Brought up to date with 1.D5
Modified Paths:
--------------
branches/development/Doxyversion
branches/development/scidavis/src/ApplicationWindow.cpp
branches/development/scidavis/src/ApplicationWindow.h
branches/development/scidavis/src/version.cpp
Added Paths:
-----------
branches/development/compileTest.sh
Modified: branches/development/Doxyversion
===================================================================
--- branches/development/Doxyversion 2014-02-13 22:14:55 UTC (rev 1415)
+++ branches/development/Doxyversion 2014-02-14 23:35:24 UTC (rev 1416)
@@ -1 +1 @@
-PROJECT_NUMBER=1.D4
+PROJECT_NUMBER=1.D005
Added: branches/development/compileTest.sh
===================================================================
--- branches/development/compileTest.sh (rev 0)
+++ branches/development/compileTest.sh 2014-02-14 23:35:24 UTC (rev 1416)
@@ -0,0 +1,12 @@
+# test that the code builds with different compile options The default
+# (aeb) build tests the default configuration (CONFIG=release, no
+# extras like Origin
+find . -name Makefile -exec rm {} \;
+qmake DEFINES=ORIGIN_IMPORT CONFIG=debug
+make clean
+make -j`grep processor /proc/cpuinfo|wc -l`
+if [ $? -ne 0 ]; then
+ echo "FAILED"
+ exit 1;
+fi
+echo "PASSED"
Property changes on: branches/development/compileTest.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/development/scidavis/src/ApplicationWindow.cpp
===================================================================
--- branches/development/scidavis/src/ApplicationWindow.cpp 2014-02-13 22:14:55 UTC (rev 1415)
+++ branches/development/scidavis/src/ApplicationWindow.cpp 2014-02-14 23:35:24 UTC (rev 1416)
@@ -11583,9 +11583,9 @@
return g;
}
-#ifdef ORIGIN_IMPORT
ApplicationWindow* ApplicationWindow::importOPJ(const QString& filename)
{
+#ifdef ORIGIN_IMPORT
if (filename.endsWith(".opj", Qt::CaseInsensitive) || filename.endsWith(".ogg", Qt::CaseInsensitive))
{
QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
@@ -11613,8 +11613,10 @@
return this;
}
else return 0;
+#else
+ return NULL;
+#endif
}
-#endif
void ApplicationWindow::deleteFitTables()
{
Modified: branches/development/scidavis/src/ApplicationWindow.h
===================================================================
--- branches/development/scidavis/src/ApplicationWindow.h 2014-02-13 22:14:55 UTC (rev 1415)
+++ branches/development/scidavis/src/ApplicationWindow.h 2014-02-14 23:35:24 UTC (rev 1416)
@@ -164,9 +164,7 @@
*/
QFile * openCompressedFile(const QString& fn);
ApplicationWindow* openProject(const QString& fn);
-#ifdef ORIGIN_IMPORT
ApplicationWindow* importOPJ(const QString& filename);
-#endif
void showHistory();
/**
Modified: branches/development/scidavis/src/version.cpp
===================================================================
--- branches/development/scidavis/src/version.cpp 2014-02-13 22:14:55 UTC (rev 1415)
+++ branches/development/scidavis/src/version.cpp 2014-02-14 23:35:24 UTC (rev 1416)
@@ -1,4 +1,4 @@
#include "globals.h"
-const int SciDAVis::scidavis_versionNo = 65540;
-const char* SciDAVis::scidavis_version = "1.D004";
-const char * SciDAVis::release_date = "Jan 25, 2014";
+const int SciDAVis::scidavis_versionNo = 65541;
+const char* SciDAVis::scidavis_version = "1.D005";
+const char * SciDAVis::release_date = "Feb 15, 2014";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hp...@us...> - 2014-05-20 08:00:29
|
Revision: 1435
http://sourceforge.net/p/scidavis/svn/1435
Author: hpcoder
Date: 2014-05-20 08:00:25 +0000 (Tue, 20 May 2014)
Log Message:
-----------
Support for the MXE cross-compilation environment.
Modified Paths:
--------------
branches/development/scidavis/basic.pri
branches/development/scidavis/python.pri
branches/development/scidavis/scidavis.pro
branches/development/scidavis/src/ApplicationWindow.cpp
branches/development/scidavis.pro
Modified: branches/development/scidavis/basic.pri
===================================================================
--- branches/development/scidavis/basic.pri 2014-05-18 10:17:26 UTC (rev 1434)
+++ branches/development/scidavis/basic.pri 2014-05-20 08:00:25 UTC (rev 1435)
@@ -17,7 +17,9 @@
}
!isEmpty(plugins.path): DEFINES += PLUGIN_PATH="\\\"$$replace(plugins.path," ","\ ")\\\"
-win32:DEFINES += QT_DLL QT_THREAD_SUPPORT
+!mxe {
+ win32:DEFINES += QT_DLL QT_THREAD_SUPPORT
+}
QT += opengl qt3support network svg xml
MOC_DIR = ../tmp/scidavis
Modified: branches/development/scidavis/python.pri
===================================================================
--- branches/development/scidavis/python.pri 2014-05-18 10:17:26 UTC (rev 1434)
+++ branches/development/scidavis/python.pri 2014-05-20 08:00:25 UTC (rev 1435)
@@ -29,13 +29,19 @@
}
win32 {
+ mxe {
+ LIBS += -lpython27
+ } else {
INCLUDEPATH += $$system(call python-includepath.py)
LIBS += $$system(call python-libs-win.py)
# TODO: fix the command below (only really necessary if SIP_DIR != MOC/OBJECTS_DIR)
#system(md $${SIP_DIR})
- system($$system(call python-sipcmd.py) -c $${SIP_DIR} src/scidavis.sip)
+ system($$system(call python-sipcmd.py) -c $${SIP_DIR} src/scidavis.sip)
+ }
}
+
+
##################### SIP generated files #####################
HEADERS += $${SIP_DIR}/sipAPIscidavis.h
Modified: branches/development/scidavis/scidavis.pro
===================================================================
--- branches/development/scidavis/scidavis.pro 2014-05-18 10:17:26 UTC (rev 1434)
+++ branches/development/scidavis/scidavis.pro 2014-05-20 08:00:25 UTC (rev 1435)
@@ -290,7 +290,8 @@
}
}
-win32 {
+win32: {
+!mxe {
### Static linking mostly, except Qt, Python and QwtPlot3D.
### The latter seems to be impossible to link statically on Windows.
@@ -313,8 +314,22 @@
LIBS += "$${LIBPATH}/liborigin/build/liborigin.a"
INCLUDEPATH += "$${LIBPATH}/liborigin" "$${LIBPATH}/liborigin/build"
}
+ }
}
+# Mingw cross compilation environment on Linux.
+mxe {
+ DEFINES += NOASSISTANT
+ INCLUDEPATH += . "$$(HOME)/usr/mxe/include"
+ LIBPATH += "$(HOME)/usr/mxe/lib" "$(HOME)/usr/mxe/lib64"
+ LIBS += -lqwt -lqwtplot3d -lmuparser -lgsl -lgslcblas
+ # Qt libraries specified here to get around a dependency bug in qmake
+ LIBS += -lQt3Support -lQtOpenGL -lQtGui -lQtNetwork -lQtCore
+ LIBS += -lole32 -loleaut32 -limm32 -lcomdlg32 -luuid
+ LIBS += -lwinspool -lssl -lcrypto -lwinmm -lgdi32 -lws2_32
+ LIBS += -ljpeg -lpng -lmng -ltiff -lz -llzma -llcms2
+ LIBS += -lopengl32 -lglu32
+}
#############################################################################
### Names of the lupdate and lrelease programs #
Modified: branches/development/scidavis/src/ApplicationWindow.cpp
===================================================================
--- branches/development/scidavis/src/ApplicationWindow.cpp 2014-05-18 10:17:26 UTC (rev 1434)
+++ branches/development/scidavis/src/ApplicationWindow.cpp 2014-05-20 08:00:25 UTC (rev 1435)
@@ -142,7 +142,9 @@
#include <QVarLengthArray>
#include <QList>
#include <QUrl>
+#ifndef NOASSISTANT
#include <QtAssistant/QAssistantClient>
+#endif
#include <QStatusBar>
#include <QToolButton>
#include <QSignalMapper>
@@ -284,7 +286,9 @@
createLanguagesList();
insertTranslatedStrings();
- assistant = new QAssistantClient( QString(), this );
+#ifndef NOASSISTANT
+ assistant = new QAssistantClient( QString(), this );
+#endif
actionNextWindow = new QAction(QIcon(QPixmap(":/next.xpm")), tr("&Next","next window"), this);
actionNextWindow->setShortcut( tr("F5","next window shortcut") );
@@ -8270,10 +8274,12 @@
}
QStringList cmdLst = QStringList() << "-profile" << profilePath;
- QAssistantClient *assist = new QAssistantClient( QString(), 0);
- assist->setArguments( cmdLst );
- assist->showPage(helpPath);
- connect(assist, SIGNAL(assistantClosed()), qApp, SLOT(quit()) );
+#ifndef NOASSISTANT
+ QAssistantClient *assist = new QAssistantClient( QString(), 0);
+ assist->setArguments( cmdLst );
+ assist->showPage(helpPath);
+ connect(assist, SIGNAL(assistantClosed()), qApp, SLOT(quit()) );
+#endif
}
void ApplicationWindow::showHelp()
@@ -8301,8 +8307,10 @@
}
QStringList cmdLst = QStringList() << "-profile" << profilePath;
+#ifndef NOASSISTANT
assistant->setArguments( cmdLst );
assistant->showPage(helpFilePath);
+#endif
}
void ApplicationWindow::showPlotWizard()
Modified: branches/development/scidavis.pro
===================================================================
--- branches/development/scidavis.pro 2014-05-18 10:17:26 UTC (rev 1434)
+++ branches/development/scidavis.pro 2014-05-20 08:00:25 UTC (rev 1435)
@@ -9,10 +9,11 @@
SUBDIRS = scidavis
+!mxe {
# optional fit plugins
SUBDIRS += fitPlugins/fitRational0\
fitPlugins/fitRational1\
fitPlugins/explin\
fitPlugins/exp_saturation\
fitPlugins/planck_wavelength\
-
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hp...@us...> - 2014-07-22 11:27:07
|
Revision: 1448
http://sourceforge.net/p/scidavis/svn/1448
Author: hpcoder
Date: 2014-07-22 11:27:01 +0000 (Tue, 22 Jul 2014)
Log Message:
-----------
Merge of 1.D7 back into development
Modified Paths:
--------------
branches/development/3rdparty/liborigin/OriginDefaultParser.cpp
branches/development/Doxyversion
branches/development/makeVersion.sh
branches/development/mkMacDist.sh
branches/development/scidavis/basic.pri
branches/development/scidavis/muparser.pri
branches/development/scidavis/python-sipcmd.py
branches/development/scidavis/python.pri
branches/development/scidavis/scidavis.pro
branches/development/scidavis/sourcefiles.pri
branches/development/scidavis/src/PythonScripting.cpp
branches/development/scidavis/src/globals.cpp
branches/development/scidavis/src/version.cpp
branches/development/scidavis/translations/scidavis_cs-alt.ts
branches/development/scidavis/translations/scidavis_cs.ts
branches/development/scidavis/translations/scidavis_de.ts
branches/development/scidavis/translations/scidavis_es.ts
branches/development/scidavis/translations/scidavis_fr.ts
branches/development/scidavis/translations/scidavis_ja.ts
branches/development/scidavis/translations/scidavis_pt-br.ts
branches/development/scidavis/translations/scidavis_ru.ts
branches/development/scidavis/translations/scidavis_sv.ts
branches/development/scidavis.pro
Added Paths:
-----------
branches/development/3rdparty/liborigin/liborigin.pro
branches/development/config.pri
branches/development/template/
branches/development/template/test
branches/development/test/
branches/development/test/00/
branches/development/test/00/t0001a.sh
branches/development/test/Histo.opj
branches/development/test/readWriteProject.cpp
branches/development/test/readWriteProject.h
branches/development/test/test.pro
branches/development/test/testProject.sciprj
Modified: branches/development/3rdparty/liborigin/OriginDefaultParser.cpp
===================================================================
--- branches/development/3rdparty/liborigin/OriginDefaultParser.cpp 2014-07-22 03:54:42 UTC (rev 1447)
+++ branches/development/3rdparty/liborigin/OriginDefaultParser.cpp 2014-07-22 11:27:01 UTC (rev 1448)
@@ -73,10 +73,12 @@
return false;
}
+#ifndef NO_CODE_GENERATION_FOR_LOG
if((debug=fopen("opjfile.log","a")) == NULL ) {
printf("Could not open log file!\n");
return false;
}
+#endif // NO_CODE_GENERATION_FOR_LOG
////////////////////////////// check version from header ///////////////////////////////
char vers[5];
@@ -89,7 +91,7 @@
unsigned char c=0; // tmp char
- fprintf(debug,"HEADER :\n");
+ LOG_PRINT(debug,"HEADER :\n");
for(i=0;i<0x16;i++) { // skip header + 5 Bytes ("27")
ioret = fread(&c,1,1,f);
fprintf(debug,"%.2X ",c);
Added: branches/development/3rdparty/liborigin/liborigin.pro
===================================================================
--- branches/development/3rdparty/liborigin/liborigin.pro (rev 0)
+++ branches/development/3rdparty/liborigin/liborigin.pro 2014-07-22 11:27:01 UTC (rev 1448)
@@ -0,0 +1,3 @@
+# this file is not part of the liborigin library, but purely to allow
+# the build to be integrated with scidavis's build
+
Modified: branches/development/Doxyversion
===================================================================
--- branches/development/Doxyversion 2014-07-22 03:54:42 UTC (rev 1447)
+++ branches/development/Doxyversion 2014-07-22 11:27:01 UTC (rev 1448)
@@ -1 +1 @@
-PROJECT_NUMBER=1.D005
+PROJECT_NUMBER=1.D007
Added: branches/development/config.pri
===================================================================
--- branches/development/config.pri (rev 0)
+++ branches/development/config.pri 2014-07-22 11:27:01 UTC (rev 1448)
@@ -0,0 +1,357 @@
+###
+### In most cases, defaults and auto-detection should provide an easy way of
+### building SciDAVis without changing anything in this file (in contrast to
+### prior versions).
+###
+### Windows users are expected to place all dependencies in the 3rdparty folder
+### with default directory names (i.e., with version numbers stripped). In case
+### you already have copies of the libraries installed somewhere, you need to
+### change the paths below in order to use them.
+###
+### On Linux and MacOS X, the default configuration assumes Qwt and QwtPlot3D
+### sources to be unpacked to the 3rdparty folders, with version numbers
+### stripped from the directory names (as on Windows). If you're sure that a
+### system-wide installation of Qwt and QwtPlot3D (e.g. from your distribution's
+### package manager) is compiled against Qt4 (not Qt3), you can use it by
+### executing "qmake PRESET=linux_package" instead of just "qmake" during the
+### build process. Note that this also disables some features which are
+### commonly not needed or even bothersome when integrating SciDAVis in a
+### package manager (user-selectable paths to manual/plugins, checking for new
+### versions on startup).
+###
+
+################################################################################
+### Choose between common configurations #
+### #
+### (currently not applicable on Windows) #
+### Depending on your system and requirements, you may or may not need to #
+### fine-tune other options below. #
+################################################################################
+
+unix:isEmpty(PRESET) { # allow command-line argument to override settings here
+
+ ### Link statically against Qwt and Qwtplot3D in 3rdparty folder
+ ### (in order to make sure they're compiled against Qt4, not Qt3).
+ ### Intended for Linux users building from source (on possibly somewhat
+ ### older systems).
+ #PRESET = default_installation
+
+ ### Link dynamically against system-wide installed libraries. Intended mainly
+ ### for building Linux packages for distributions with Qwt and QwtPlot3D
+ ### packages compiled against Qt4 (probably most current ones).
+ PRESET = linux_package
+
+ ### Link statically as much as possible. Qwt, QwtPlot3D and MuParser are
+ ### expected to be supplied in the 3rdparty folder. Python, SIP, PyQt and Qt
+ ### are linked in dynamically in order to integrate with an existing Python
+ ### installation. Intended mainly for building self-contained Linux binaries.
+ ### (TODO: Could we include SIP+PyQt+Qt in the self-contained bundle, as done
+ ### in the Windows installer?)
+ #PRESET = self_contained
+}
+
+unix:message(Building with preset $$PRESET)
+
+################################################################################
+### What to install #
+### #
+### Comment out anything you want to exclude. #
+################################################################################
+
+### this is the program itself
+INSTALLS += target
+
+### README, INSTALL.html, manual (if present in the manual subfolder), etc.
+INSTALLS += documentation
+
+### translations
+INSTALLS += translationfiles
+
+### icon file (for Windows installer)
+win32:INSTALLS += win_icon
+
+### Linux Desktop integration
+!contains(PRESET, self_contained) {
+ unix:INSTALLS += desktop_entry mime_package mime_link icons
+}
+
+################################################################################
+### Where to install #
+### #
+### IMPORTANT: The paths given here specify where SciDAVis will search for #
+### the files at runtime. If you want "make install" to place them #
+### anywhere else (e.g. in a temporary directory structure used for #
+### building a package), use "make INSTALL_ROOT=/some/place install"#
+### and/or copy files to the desired locations by other means. #
+################################################################################
+
+unix {# Linux / MacOS X
+ contains(PRESET, self_contained) {
+ ### Unless you're trying to build a self-contained bundle, see the
+ ### (heavily commented) "else" block below.
+
+ ### When installing into a self-contained directory structure (e.g. for
+ ### universal Linux binaries), use relative paths at runtime in order to
+ ### support relocation.
+ isEmpty(INSTALLBASE): INSTALLBASE = .
+
+ target.path = "$$INSTALLBASE"
+
+ documentation.path = "$$INSTALLBASE/doc"
+ manual.path = "$$INSTALLBASE/manual"
+
+ translationfiles.path = "$$INSTALLBASE/translations"
+
+ pythonconfig.path = "$$INSTALLBASE"
+ pythonutils.path = "$$INSTALLBASE"
+
+ plugins.path = "$$INSTALLBASE/plugins"
+
+ } else {
+
+ ### this is what is called "prefix" when using GNU autotools
+ isEmpty(INSTALLBASE): INSTALLBASE = /usr
+
+ ### where to put the binary (the application itself)
+ target.path = "$$INSTALLBASE/bin"
+
+ ### location of documentation files
+ documentation.path = "$$INSTALLBASE/share/doc/scidavis"
+
+ ### Usually, the manual will be expected in the "manual" subfolder of "documentation.path" (see above).
+ ### To override this, uncomment the next line and adjust the path behind the '='.
+ #manual.path = "$$INSTALLBASE/share/doc/scidavis/manual"
+
+ ### location of translation files (*.qm)
+ translationfiles.path = "$$INSTALLBASE/share/scidavis/translations"
+
+ ### Important (if you use Python): the following two paths are where the application will expect
+ ### scidavisrc.py and scidavisUtil.py, respectively. Alternatively you can also put scidavisrc.py
+ ### (or ".scidavis.py") into the users home directory. scidavisUtil.py must be either in the
+ ### directory specified here or somewhere else in the python path (sys.path) where "import" can find it
+
+ ### where scidavisrc.py is searched for at runtime
+ pythonconfig.path = "$$INSTALLBASE/../etc"
+ ### where the scidavisUtil python module is searched for at runtime
+ pythonutils.path = "$$INSTALLBASE/share/scidavis"
+
+ ### where plugins are expected by default
+ plugins.path = "$$INSTALLBASE/lib/scidavis/plugins"
+ }
+}
+
+win32 {# Windows
+ isEmpty(INSTALLBASE): INSTALLBASE = .
+
+ target.path = "$$INSTALLBASE"
+ documentation.path = "$$INSTALLBASE"
+ translationfiles.path = "$$INSTALLBASE/translations"
+ pythonconfig.path = "$$INSTALLBASE"
+ pythonutils.path = "$$INSTALLBASE"
+ plugins.path = "$$INSTALLBASE/fitPlugins"
+}
+
+### 64bit Linux only suffix
+linux-g++-64: libsuff = 64
+unix:LIBS += -L/usr/lib$${libsuff}
+
+################################################################################
+### Optional features #
+################################################################################
+
+### a console displaying output of scripts; particularly useful on Windows
+### where running SciDAVis from a terminal is inconvenient
+DEFINES += SCRIPTING_CONSOLE
+
+### a dialog for selecting the scripting language on a per-project basis
+DEFINES += SCRIPTING_DIALOG
+
+!contains(PRESET, linux_package) {
+ ### Enables choosing of help folder at runtime, instead of relying on the above path only.
+ ### The downside is that the help folder will be remembered as a configuration option, so a binary
+ ### package cannot easily update the path for its users.
+ ### Dynamic selection of the manual path was the only available option up until SciDAVis 0.2.3.
+ DEFINES += DYNAMIC_MANUAL_PATH
+
+ ### Similar to DYNAMIC_MANUAL_PATH, but for the plugin folder
+ DEFINES += DYNAMIC_PLUGIN_PATH
+
+ ### Check for new releases on startup (can be disabled in the preferences).
+ DEFINES += SEARCH_FOR_UPDATES
+
+ ### Provide links to manual/translations download in help menu
+ DEFINES += DOWNLOAD_LINKS
+}
+
+### (remark: muparser.pri and python.pri must be included after defining INSTALLBASE )
+### building without muParser does not work yet (but will in a future version)
+include( ../scidavis/muparser.pri )
+### comment out the following line to deactivate Python scripting support
+include( ../scidavis/python.pri )
+
+### support for Origin OPJ import using liborigin2
+DEFINES += ORIGIN_IMPORT
+
+################################################################################
+### Dependencies #
+################################################################################
+
+# code for maintained branch of liborigin.
+contains(DEFINES, ORIGIN_IMPORT) {
+ LIBS += ../3rdparty/liborigin/liborigin.a
+ INCLUDEPATH += ../3rdparty/liborigin
+ }
+
+contains(PRESET, default_installation) {
+ ### Link statically against Qwt and Qwtplot3D (in order to make sure they
+ ### are compiled against Qt4), dynamically against everything else.
+
+ INCLUDEPATH += ../3rdparty/qwt/src
+ LIBS += ../3rdparty/qwt/lib/libqwt.a
+
+ INCLUDEPATH += ../3rdparty/qwtplot3d/include
+ LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
+
+ INCLUDEPATH += /usr/include/muParser
+ LIBS += -lgsl -lgslcblas -lz -lGLU
+ LIBS += -lmuparser
+
+ contains(DEFINES, ORIGIN_IMPORT) {
+ LIBS += -L../3rdparty/liborigin -lorigin
+ INCLUDEPATH += ../3rdparty/liborigin
+ }
+}
+
+contains(PRESET, mac_dist) {
+ # Uses MacPorts supplied versions of the dependencies
+
+ INCLUDEPATH += /opt/local/include
+ INCLUDEPATH += /opt/local/include/qwt
+
+ LIBS += -L/opt/local/lib -lqwt
+
+ INCLUDEPATH += /opt/local/include/qwtplot3d
+ LIBS += -lqwtplot3d
+
+ INCLUDEPATH += /opt/local/include/muParser
+ LIBS += -lgsl -lgslcblas -lz
+ LIBS += -lmuparser -lpython2.7
+
+ contains(DEFINES, ORIGIN_IMPORT) {
+ LIBS += -L../3rdparty/liborigin2 -lorigin
+ INCLUDEPATH += ../3rdparty/liborigin2
+ }
+
+ QMAKE_EXTRA_TARGETS += mac-dist
+ mac-dist.commands = sh mkMacDist.sh
+
+}
+
+contains(PRESET, linux_package) {
+ ### dynamically link against Qwt(3D) installed system-wide
+ ### WARNING: make sure they are compiled against >= Qt4.2
+ ### Mixing Qt 4.2 and Qt >= 4.3 compiled stuff may also
+ ### cause problems.
+
+ ### Debian suffix
+ exists(/usr/include/qwt-qt4): qwtsuff = "-qt4"
+
+ exists(/usr/include/qwt5) {
+ INCLUDEPATH += /usr/include/qwt5
+ } else {
+ INCLUDEPATH += /usr/include/qwt$${qwtsuff}
+ }
+ LIBS += -lqwt$${qwtsuff} -lz -lGLU -lQtAssistantClient
+
+ INCLUDEPATH += /usr/include/qwtplot3d$${qwtsuff}
+ LIBS += -lqwtplot3d$${qwtsuff}
+
+ INCLUDEPATH += /usr/include/muParser
+ LIBS += -lgsl -lgslcblas
+ LIBS += -lmuparser
+
+ contains(DEFINES, ORIGIN_IMPORT) {
+ LIBS += -L../3rdparty/liborigin -lorigin
+ INCLUDEPATH += ../3rdparty/liborigin
+ }
+}
+
+contains(PRESET, self_contained) {
+ ### mostly static linking, for self-contained binaries
+
+ INCLUDEPATH += ../3rdparty/qwt/src
+ LIBS += ../3rdparty/qwt/lib/libqwt.a
+
+ INCLUDEPATH += ../3rdparty/qwtplot3d/include
+ LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
+
+ INCLUDEPATH += ../3rdparty/muparser/include
+ LIBS += ../3rdparty/muparser/lib/libmuparser.a
+
+ LIBS += /usr/lib/libgsl.a /usr/lib/libgslcblas.a
+
+ contains(DEFINES, ORIGIN_IMPORT) {
+ LIBS += ../3rdparty/liborigin/build/liborigin.a
+ INCLUDEPATH += ../3rdparty/liborigin ../3rdparty/liborigin/build
+ }
+}
+
+win32: {
+!mxe {
+ ### Static linking mostly, except Qt, Python and QwtPlot3D.
+ ### The latter seems to be impossible to link statically on Windows.
+
+ isEmpty(LIBPATH): LIBPATH = ../3rdparty
+
+ INCLUDEPATH += "$${LIBPATH}/qwt/src"
+ LIBS += "$${LIBPATH}/qwt/lib/libqwt.a"
+
+ INCLUDEPATH += "$${LIBPATH}/qwtplot3d/include"
+ LIBS += "$${LIBPATH}/qwtplot3d/lib/qwtplot3d.dll"
+
+ INCLUDEPATH += "$${LIBPATH}/muparser/include"
+ LIBS += "$${LIBPATH}/muparser/lib/libmuparser.a"
+
+ INCLUDEPATH += "$${LIBPATH}/gsl/include"
+ LIBS += "$${LIBPATH}/gsl/lib/libgsl.a"
+ LIBS += "$${LIBPATH}/gsl/lib/libgslcblas.a"
+
+ contains(DEFINES, ORIGIN_IMPORT) {
+ LIBS += "$${LIBPATH}/liborigin/build/liborigin.a"
+ INCLUDEPATH += "$${LIBPATH}/liborigin" "$${LIBPATH}/liborigin/build"
+ }
+ }
+}
+
+# Mingw cross compilation environment on Linux.
+mxe {
+ QMAKE_CXXFLAGS+=-g
+ DEFINES += NOASSISTANT
+ INCLUDEPATH += . "$$(HOME)/usr/mxe/include"
+ LIBPATH += "$(HOME)/usr/mxe/lib" "$(HOME)/usr/mxe/lib64"
+ LIBS += -lqwt -lqwtplot3d -lmuparser -lgsl -lgslcblas
+ # Qt libraries specified here to get around a dependency bug in qmake
+ LIBS += -lQt3Support -lQtOpenGL -lQtGui -lQtNetwork -lQtCore
+ LIBS += -lole32 -loleaut32 -limm32 -lcomdlg32 -luuid
+ LIBS += -lwinspool -lssl -lcrypto -lwinmm -lgdi32 -lws2_32
+ LIBS += -ljpeg -lpng -lmng -ltiff -lz -llzma -llcms2
+ LIBS += -lopengl32 -lglu32
+}
+
+#############################################################################
+### Names of the lupdate and lrelease programs #
+### #
+### These are needed if you want to compile and install the translations #
+### automatically. Possibly needs to be adapted if you have an unusual Qt #
+### installation. #
+#############################################################################
+
+exists(/usr/bin/lupdate-qt4) {
+ # Debian, Ubuntu, Fedora
+ LUPDATE_BIN = lupdate-qt4
+ LRELEASE_BIN = lrelease-qt4
+} else {
+ # anything else
+ LUPDATE_BIN = lupdate
+ LRELEASE_BIN = lrelease
+}
Modified: branches/development/makeVersion.sh
===================================================================
--- branches/development/makeVersion.sh 2014-07-22 03:54:42 UTC (rev 1447)
+++ branches/development/makeVersion.sh 2014-07-22 11:27:01 UTC (rev 1448)
@@ -1,5 +1,7 @@
version=$1
delta=${version##*.[CD]}
+# strip any leading 0s from delta
+delta=`echo $delta|sed -e 's/^0*//'`
branch=${version%%.*}
scidavis_version=$[$branch*65536 + $delta]
rm -f scidavis/src/version.cpp
@@ -19,4 +21,5 @@
done
# update Doxyversion
+rm -f Doxyversion
echo "PROJECT_NUMBER=$version" >Doxyversion
Modified: branches/development/mkMacDist.sh
===================================================================
--- branches/development/mkMacDist.sh 2014-07-22 03:54:42 UTC (rev 1447)
+++ branches/development/mkMacDist.sh 2014-07-22 11:27:01 UTC (rev 1448)
@@ -33,8 +33,21 @@
done
# Generic resources required for Qt
-cp -r /opt/local/Library/Frameworks/QtGui.framework/Resources/qt_menu.nib $RES_DIR
+cp -rf /opt/local/Library/Frameworks/QtGui.framework/Resources/qt_menu.nib $RES_DIR
+# python resources
+mkdir -p $RES_DIR/lib
+cp -rf /opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7 $RES_DIR/lib
+
+# python resources contain some dynamic libraries that need rewriting
+find $RES_DIR/lib -name "*.so" -print | while read soname; do
+ otool -L $soname|grep /opt/local|cut -f1 -d' '|while read oldName; do
+ install_name_tool -change $oldName @executable_path/${oldName##*/} $soname
+ done
+done
+
+
+
# copy icon, and create mainfest
cp -f scidavis/icons/scidavis.icns $RES_DIR
cat >scidavis/scidavis.app/Contents/Info.plist <<EOF
@@ -57,6 +70,11 @@
<string>scidavis</string>
<key>CFBundleIdentifier</key>
<string>net.sourceforge.scidavis</string>
+ <key>LSEnvironment</key>
+ <dict>
+ <key>PYTHONHOME</key>
+ <string>/Applications/scidavis.app/Contents/Resources</string>
+ </dict>
</dict>
</plist>
EOF
Modified: branches/development/scidavis/basic.pri
===================================================================
--- branches/development/scidavis/basic.pri 2014-07-22 03:54:42 UTC (rev 1447)
+++ branches/development/scidavis/basic.pri 2014-07-22 11:27:01 UTC (rev 1448)
@@ -6,14 +6,17 @@
TARGET = scidavis
TEMPLATE = app
+# main() is mentioned here so that sourcefiles.pri can be included in
+# other qmake project files
+SOURCES += src/main.cpp
CONFIG += qt warn_on exceptions opengl thread zlib
CONFIG += assistant
DEFINES += QT_PLUGIN
-DEFINES += TS_PATH=\\\"$$replace(translationfiles.path," ","\\ ")\\\"
-DEFINES += DOC_PATH=\\\"$$replace(documentation.path," ","\\ ")\\\"
+DEFINES += TS_PATH="\\\"$$replace(translationfiles.path," ","\\ ")\\\""
+DEFINES += DOC_PATH="\\\"$$replace(documentation.path," ","\\ ")\\\""
!isEmpty( manual.path ) {
-DEFINES += MANUAL_PATH=\\\"$$replace(manual.path," ","\\ ")\\\"
+DEFINES += MANUAL_PATH="\\\"$$replace(manual.path," ","\\ ")\\\""
}
!isEmpty(plugins.path): DEFINES += PLUGIN_PATH=\\\"$$replace(plugins.path," ","\\ ")\\\"
@@ -26,3 +29,99 @@
OBJECTS_DIR = ../tmp/scidavis
DESTDIR = ./
+###################### ICONS ################################################
+RESOURCES += appicons.qrc
+RESOURCES += icons.qrc
+RC_FILE = scidavis.rc
+
+win32 {
+ win_icon.files = icons/scidavis.ico
+ win_icon.path = "$$INSTALLBASE"
+}
+
+###################### TRANSLATIONS #########################################
+
+TRANSLATIONS = translations/scidavis_de.ts \
+ translations/scidavis_es.ts \
+ translations/scidavis_fr.ts \
+ translations/scidavis_ru.ts \
+ translations/scidavis_ja.ts \
+ translations/scidavis_sv.ts \
+ translations/scidavis_pt-br.ts \
+ translations/scidavis_cs.ts \
+ translations/scidavis_cs-alt.ts \
+
+contains( INSTALLS, translationfiles ){
+ exists(translations/scidavis_de.ts){
+ translationfiles.files = translations/scidavis_de.qm \
+ translations/scidavis_es.qm \
+ translations/scidavis_fr.qm \
+ translations/scidavis_ru.qm \
+ translations/scidavis_ja.qm \
+ translations/scidavis_sv.qm \
+ translations/scidavis_pt-br.qm \
+ translations/scidavis_cs.qm \
+ translations/scidavis_cs-alt.qm \
+
+ unix: tstarget.target = translations/scidavis_de.qm
+ win32: tstarget.target = translations\scidavis_de.qm
+# note the translation files are not writable during AEGIS
+# integration, so we don't want to perform an update then
+ tstarget.commands = (! test -w translations/scidavis_de.ts || $$LUPDATE_BIN scidavis.pro) && $$LRELEASE_BIN scidavis.pro
+
+ QMAKE_EXTRA_TARGETS += tstarget
+ PRE_TARGETDEPS += translations/scidavis_de.qm
+ }
+ !exists(translations/scidavis_de.ts){
+ message("=======================================")
+ message("Could not find translation (.ts) files.")
+ message("=======================================")
+ }
+}
+
+###################### DOCUMENTATION ########################################
+
+documentation.files += ../manual/html \
+ ../INSTALL.html \
+ ../scidavis.css \
+ ../scidavis-logo.png \
+ ../README \
+ ../CHANGES \
+ ../gpl.txt
+
+###################### DESKTOP INTEGRATION ##################################
+
+unix {
+ desktop_entry.files = scidavis.desktop
+ desktop_entry.path = "$$INSTALLBASE/share/applications"
+
+ mime_package.files = scidavis.xml
+ mime_package.path = "$$INSTALLBASE/share/mime/packages"
+
+ #deprecated
+ mime_link.files = x-sciprj.desktop
+ mime_link.path = "$$INSTALLBASE/share/mimelnk/application"
+
+ contains(INSTALLS, icons) {
+ # scalable icon
+ icons.files = icons/scidavis.svg
+ icons.path = "$$INSTALLBASE/share/icons/hicolor/scalable/apps"
+
+ # hicolor icons for different resolutions
+ resolutions = 16 22 32 48 64 128
+ for(res, resolutions) {
+ eval(icon_hicolor_$${res}.files = icons/hicolor-$${res}/scidavis.png)
+ eval(icon_hicolor_$${res}.path = "$$INSTALLBASE/share/icons/hicolor/$${res}x$${res}/apps")
+ INSTALLS += icon_hicolor_$${res}
+ }
+
+ # locolor icons for different resolutions
+ resolutions = 16 22 32
+ for(res, resolutions) {
+ eval(icon_locolor_$${res}.files = icons/locolor-$${res}/scidavis.png)
+ eval(icon_locolor_$${res}.path = "$$INSTALLBASE/share/icons/locolor/$${res}x$${res}/apps")
+
+ INSTALLS += icon_locolor_$${res}
+ }
+ }
+}
Modified: branches/development/scidavis/muparser.pri
===================================================================
--- branches/development/scidavis/muparser.pri 2014-07-22 03:54:42 UTC (rev 1447)
+++ branches/development/scidavis/muparser.pri 2014-07-22 11:27:01 UTC (rev 1448)
@@ -1,8 +1,8 @@
DEFINES += SCRIPTING_MUPARSER
-HEADERS += src/MuParserScript.h \
- src/MuParserScripting.h \
+HEADERS += ../scidavis/src/MuParserScript.h \
+ ../scidavis/src/MuParserScripting.h \
-SOURCES += src/MuParserScript.cpp \
- src/MuParserScripting.cpp \
+SOURCES += ../scidavis/src/MuParserScript.cpp \
+ ../scidavis/src/MuParserScripting.cpp \
Modified: branches/development/scidavis/python-sipcmd.py
===================================================================
--- branches/development/scidavis/python-sipcmd.py 2014-07-22 03:54:42 UTC (rev 1447)
+++ branches/development/scidavis/python-sipcmd.py 2014-07-22 11:27:01 UTC (rev 1448)
@@ -29,7 +29,7 @@
from PyQt4 import pyqtconfig
config = pyqtconfig.Configuration()
-flags = []
+flags = ["-I ../scidavis"]
if config.sip_version >= 0x040a00:
# make use of docstring generation feature in SIP >= 4.10
flags.append("-o")
Modified: branches/development/scidavis/python.pri
===================================================================
--- branches/development/scidavis/python.pri 2014-07-22 03:54:42 UTC (rev 1447)
+++ branches/development/scidavis/python.pri 2014-07-22 11:27:01 UTC (rev 1448)
@@ -2,31 +2,33 @@
INSTALLS += pythonconfig
pythonconfig.files += scidavisrc.py
- DEFINES += PYTHON_CONFIG_PATH=\\\"$$replace(pythonconfig.path," ","\\ ")\\\"
+ DEFINES += PYTHON_CONFIG_PATH="\\\"$$replace(pythonconfig.path," ","\\ ")\\\""
INSTALLS += pythonutils
pythonutils.files += scidavisUtil.py
- DEFINES += PYTHON_UTIL_PATH=\\\"$$replace(pythonutils.path," ","\\ ")\\\"
+ DEFINES += PYTHON_UTIL_PATH="\\\"$$replace(pythonutils.path," ","\\ ")\\\""
SIP_DIR = ../tmp/scidavis
DEFINES += SCRIPTING_PYTHON
- HEADERS += src/PythonScript.h src/PythonScripting.h
- SOURCES += src/PythonScript.cpp src/PythonScripting.cpp
+ HEADERS += ../scidavis/src/PythonScript.h ../scidavis/src/PythonScripting.h
+ SOURCES += ../scidavis/src/PythonScript.cpp ../scidavis/src/PythonScripting.cpp
unix {
INCLUDEPATH += $$system(python python-includepath.py)
- !contains(PRESET,mac_dist) {
+ contains(PRESET,mac_dist) {
+ DEFINES += PYTHONHOME=/Applications/scidavis.app/Contents/Resources
+ } else {
macx {
LIBS += -framework Python
} else {
LIBS += $$system(python -c "\"from distutils import sysconfig; print '-lpython'+sysconfig.get_config_var('VERSION')\"")
}
- }
+ }
LIBS += -lm
system(mkdir -p $${SIP_DIR})
- system($$system(python python-sipcmd.py) -c $${SIP_DIR} src/scidavis.sip)
+ system($$system(python python-sipcmd.py) -c $${SIP_DIR} ../scidavis/src/scidavis.sip)
}
win32 {
@@ -40,12 +42,11 @@
LIBS += $$system(call python-libs-win.py)
# TODO: fix the command below (only really necessary if SIP_DIR != MOC/OBJECTS_DIR)
#system(md $${SIP_DIR})
- system($$system(call python-sipcmd.py) -c $${SIP_DIR} src/scidavis.sip)
- }
+ system($$system(call python-sipcmd.py) -c $${SIP_DIR} ../scidavis/src/scidavis.sip)
}
+}
-
##################### SIP generated files #####################
HEADERS += $${SIP_DIR}/sipAPIscidavis.h
Modified: branches/development/scidavis/scidavis.pro
===================================================================
--- branches/development/scidavis/scidavis.pro 2014-07-22 03:54:42 UTC (rev 1447)
+++ branches/development/scidavis/scidavis.pro 2014-07-22 11:27:01 UTC (rev 1448)
@@ -1,359 +1,4 @@
-###
-### In most cases, defaults and auto-detection should provide an easy way of
-### building SciDAVis without changing anything in this file (in contrast to
-### prior versions).
-###
-### Windows users are expected to place all dependencies in the 3rdparty folder
-### with default directory names (i.e., with version numbers stripped). In case
-### you already have copies of the libraries installed somewhere, you need to
-### change the paths below in order to use them.
-###
-### On Linux and MacOS X, the default configuration assumes Qwt and QwtPlot3D
-### sources to be unpacked to the 3rdparty folders, with version numbers
-### stripped from the directory names (as on Windows). If you're sure that a
-### system-wide installation of Qwt and QwtPlot3D (e.g. from your distribution's
-### package manager) is compiled against Qt4 (not Qt3), you can use it by
-### executing "qmake PRESET=linux_package" instead of just "qmake" during the
-### build process. Note that this also disables some features which are
-### commonly not needed or even bothersome when integrating SciDAVis in a
-### package manager (user-selectable paths to manual/plugins, checking for new
-### versions on startup).
-###
-
-################################################################################
-### Choose between common configurations #
-### #
-### (currently not applicable on Windows) ...
[truncated message content] |
|
From: <hp...@us...> - 2014-07-23 07:16:27
|
Revision: 1449
http://sourceforge.net/p/scidavis/svn/1449
Author: hpcoder
Date: 2014-07-23 07:16:21 +0000 (Wed, 23 Jul 2014)
Log Message:
-----------
Merged in 1.D8
Modified Paths:
--------------
branches/development/Doxyversion
branches/development/config.pri
branches/development/scidavis/src/version.cpp
branches/development/scidavis.pro
Modified: branches/development/Doxyversion
===================================================================
--- branches/development/Doxyversion 2014-07-22 11:27:01 UTC (rev 1448)
+++ branches/development/Doxyversion 2014-07-23 07:16:21 UTC (rev 1449)
@@ -1 +1 @@
-PROJECT_NUMBER=1.D007
+PROJECT_NUMBER=1.D008
Modified: branches/development/config.pri
===================================================================
--- branches/development/config.pri 2014-07-22 11:27:01 UTC (rev 1448)
+++ branches/development/config.pri 2014-07-23 07:16:21 UTC (rev 1449)
@@ -216,10 +216,10 @@
LIBS += -lgsl -lgslcblas -lz -lGLU
LIBS += -lmuparser
- contains(DEFINES, ORIGIN_IMPORT) {
- LIBS += -L../3rdparty/liborigin -lorigin
- INCLUDEPATH += ../3rdparty/liborigin
- }
+# contains(DEFINES, ORIGIN_IMPORT) {
+# LIBS += -L../3rdparty/liborigin -lorigin
+# INCLUDEPATH += ../3rdparty/liborigin
+# }
}
contains(PRESET, mac_dist) {
@@ -237,10 +237,10 @@
LIBS += -lgsl -lgslcblas -lz
LIBS += -lmuparser -lpython2.7
- contains(DEFINES, ORIGIN_IMPORT) {
- LIBS += -L../3rdparty/liborigin2 -lorigin
- INCLUDEPATH += ../3rdparty/liborigin2
- }
+# contains(DEFINES, ORIGIN_IMPORT) {
+# LIBS += -L../3rdparty/liborigin2 -lorigin
+# INCLUDEPATH += ../3rdparty/liborigin2
+# }
QMAKE_EXTRA_TARGETS += mac-dist
mac-dist.commands = sh mkMacDist.sh
@@ -270,10 +270,10 @@
LIBS += -lgsl -lgslcblas
LIBS += -lmuparser
- contains(DEFINES, ORIGIN_IMPORT) {
- LIBS += -L../3rdparty/liborigin -lorigin
- INCLUDEPATH += ../3rdparty/liborigin
- }
+# contains(DEFINES, ORIGIN_IMPORT) {
+# LIBS += -L../3rdparty/liborigin -lorigin
+# INCLUDEPATH += ../3rdparty/liborigin
+# }
}
contains(PRESET, self_contained) {
@@ -290,10 +290,10 @@
LIBS += /usr/lib/libgsl.a /usr/lib/libgslcblas.a
- contains(DEFINES, ORIGIN_IMPORT) {
- LIBS += ../3rdparty/liborigin/build/liborigin.a
- INCLUDEPATH += ../3rdparty/liborigin ../3rdparty/liborigin/build
- }
+# contains(DEFINES, ORIGIN_IMPORT) {
+# LIBS += ../3rdparty/liborigin/build/liborigin.a
+# INCLUDEPATH += ../3rdparty/liborigin ../3rdparty/liborigin/build
+# }
}
win32: {
@@ -316,10 +316,10 @@
LIBS += "$${LIBPATH}/gsl/lib/libgsl.a"
LIBS += "$${LIBPATH}/gsl/lib/libgslcblas.a"
- contains(DEFINES, ORIGIN_IMPORT) {
- LIBS += "$${LIBPATH}/liborigin/build/liborigin.a"
- INCLUDEPATH += "$${LIBPATH}/liborigin" "$${LIBPATH}/liborigin/build"
- }
+# contains(DEFINES, ORIGIN_IMPORT) {
+# LIBS += "$${LIBPATH}/liborigin/build/liborigin.a"
+# INCLUDEPATH += "$${LIBPATH}/liborigin" "$${LIBPATH}/liborigin/build"
+# }
}
}
Modified: branches/development/scidavis/src/version.cpp
===================================================================
--- branches/development/scidavis/src/version.cpp 2014-07-22 11:27:01 UTC (rev 1448)
+++ branches/development/scidavis/src/version.cpp 2014-07-23 07:16:21 UTC (rev 1449)
@@ -1,4 +1,4 @@
#include "globals.h"
-const int SciDAVis::scidavis_versionNo = 65543;
-const char* SciDAVis::scidavis_version = "1.D007";
-const char * SciDAVis::release_date = "Jul 22, 2014";
+const int SciDAVis::scidavis_versionNo = 65544;
+const char* SciDAVis::scidavis_version = "1.D008";
+const char * SciDAVis::release_date = "Jul 23, 2014";
Modified: branches/development/scidavis.pro
===================================================================
--- branches/development/scidavis.pro 2014-07-22 11:27:01 UTC (rev 1448)
+++ branches/development/scidavis.pro 2014-07-23 07:16:21 UTC (rev 1449)
@@ -11,7 +11,7 @@
CONFIG+=ordered
# Overwrite the qmake generated Makefile by the cmake one
-system("cd 3rdparty/liborigin; cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_CXX_FLAGS:STRING=-DNO_CODE_GENERATION_FOR_LOG .")
+system("cd 3rdparty/liborigin; rm CMakeCache.txt; cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_CXX_FLAGS:STRING=-DNO_CODE_GENERATION_FOR_LOG .")
!mxe {
# optional fit plugins
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hp...@us...> - 2014-08-26 23:50:33
|
Revision: 1450
http://sourceforge.net/p/scidavis/svn/1450
Author: hpcoder
Date: 2014-08-26 23:50:25 +0000 (Tue, 26 Aug 2014)
Log Message:
-----------
Fixes to the liborigin vendor branch to allow it to compile under MXE
Disable python on MXE build
Modified Paths:
--------------
branches/development/3rdparty/liborigin/Origin750Parser.h
branches/development/3rdparty/liborigin/opj2dat.cpp
branches/development/config.pri
branches/development/scidavis.pro
Modified: branches/development/3rdparty/liborigin/Origin750Parser.h
===================================================================
--- branches/development/3rdparty/liborigin/Origin750Parser.h 2014-07-23 07:16:21 UTC (rev 1449)
+++ branches/development/3rdparty/liborigin/Origin750Parser.h 2014-08-26 23:50:25 UTC (rev 1450)
@@ -35,6 +35,7 @@
#include "endianfstream.hh"
#include <string>
#include <cmath> // for floor()
+#include <stdlib.h>
using namespace std;
using namespace Origin;
Modified: branches/development/3rdparty/liborigin/opj2dat.cpp
===================================================================
--- branches/development/3rdparty/liborigin/opj2dat.cpp 2014-07-23 07:16:21 UTC (rev 1449)
+++ branches/development/3rdparty/liborigin/opj2dat.cpp 2014-08-26 23:50:25 UTC (rev 1450)
@@ -30,6 +30,7 @@
#include <cstdio>
#include <cmath>
#include <cstring>
+#include <sstream>
#include <string.h>
int main(int argc, char *argv[]) {
@@ -66,16 +67,20 @@
j+1,column.name.c_str(),column.type,spread.maxRows);
}
FILE *out;
- char * filename;
+ // char * filename;
int ioret;
-#ifndef WIN32
- ioret=asprintf(&filename,"%s.%d.dat",argv[1],s+1);
-#else
- ioret=asprintf(&filename,"%s.%d.dat",basename(argv[1]),s+1);
-#endif
- printf("saved to %s\n",filename);
- if((out=fopen(filename,"w")) == NULL ) {
- printf("Could not open %s",filename);
+ // RKS - why the different behaviour on Windows to unix?
+ // RKS - also previous code leaks
+//#ifndef WIN32
+// ioret=asprintf(&filename,"%s.%d.dat",argv[1],s+1);
+//#else
+// ioret=asprintf(&filename,"%s.%d.dat",basename(argv[1]),s+1);
+//#endif
+ std::ostringstream os;
+ os<<argv[1]<<"."<<s+1<<".dat";
+ printf("saved to %s\n",os.str().c_str());
+ if((out=fopen(os.str().c_str(),"w")) == NULL ) {
+ printf("Could not open %s",os.str().c_str());
return -1;
}
// header
Modified: branches/development/config.pri
===================================================================
--- branches/development/config.pri 2014-07-23 07:16:21 UTC (rev 1449)
+++ branches/development/config.pri 2014-08-26 23:50:25 UTC (rev 1450)
@@ -187,7 +187,9 @@
### building without muParser does not work yet (but will in a future version)
include( ../scidavis/muparser.pri )
### comment out the following line to deactivate Python scripting support
+!mxe {
include( ../scidavis/python.pri )
+}
### support for Origin OPJ import using liborigin2
DEFINES += ORIGIN_IMPORT
Modified: branches/development/scidavis.pro
===================================================================
--- branches/development/scidavis.pro 2014-07-23 07:16:21 UTC (rev 1449)
+++ branches/development/scidavis.pro 2014-08-26 23:50:25 UTC (rev 1450)
@@ -11,7 +11,12 @@
CONFIG+=ordered
# Overwrite the qmake generated Makefile by the cmake one
-system("cd 3rdparty/liborigin; rm CMakeCache.txt; cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_CXX_FLAGS:STRING=-DNO_CODE_GENERATION_FOR_LOG .")
+mxe {
+# urrgh! - maybe adding a qmake.pro file for liborigin might be better...
+ system("cd 3rdparty/liborigin; rm CMakeCache.txt; cmake -DCMAKE_TOOLCHAIN_FILE=/scratch/rks/github/mxe/usr/i686-pc-mingw32.static/share/cmake/mxe-conf.cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_CXX_FLAGS:STRING=-DNO_CODE_GENERATION_FOR_LOG .")
+} else {
+ system("cd 3rdparty/liborigin; rm CMakeCache.txt; cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_CXX_FLAGS:STRING=-DNO_CODE_GENERATION_FOR_LOG .")
+}
!mxe {
# optional fit plugins
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hp...@us...> - 2014-10-27 00:06:39
|
Revision: 1459
http://sourceforge.net/p/scidavis/svn/1459
Author: hpcoder
Date: 2014-10-27 00:06:30 +0000 (Mon, 27 Oct 2014)
Log Message:
-----------
Created a qmake configuration file for the liborigin vendor branch.
Modified Paths:
--------------
branches/development/3rdparty/liborigin/liborigin.pro
branches/development/scidavis.pro
Modified: branches/development/3rdparty/liborigin/liborigin.pro
===================================================================
--- branches/development/3rdparty/liborigin/liborigin.pro 2014-10-03 13:33:46 UTC (rev 1458)
+++ branches/development/3rdparty/liborigin/liborigin.pro 2014-10-27 00:06:30 UTC (rev 1459)
@@ -1,3 +1,27 @@
-# this file is not part of the liborigin library, but purely to allow
-# the build to be integrated with scidavis's build
+# this file is not part of the liborigin library, which uses the cmake
+# system, but must be maintained separately of liborigin
+TEMPLATE = lib
+CONFIG += staticlib
+TARGET = origin
+# following define required to prevent the catastrophic logging when
+# large files are imported
+DEFINE += NO_CODE_GENERATION_FOR_LOG
+
+HEADERS += \
+ config.h \
+ OriginObj.h\
+ OriginFile.h\
+ OriginParser.h\
+ tree.hh
+
+SOURCES += \
+ OriginFile.cpp\
+ OriginParser.cpp\
+ OriginDefaultParser.cpp\
+ Origin600Parser.cpp\
+ Origin610Parser.cpp\
+ Origin700Parser.cpp\
+ Origin750Parser.cpp\
+ Origin800Parser.cpp\
+ Origin810Parser.cpp
Modified: branches/development/scidavis.pro
===================================================================
--- branches/development/scidavis.pro 2014-10-03 13:33:46 UTC (rev 1458)
+++ branches/development/scidavis.pro 2014-10-27 00:06:30 UTC (rev 1459)
@@ -10,14 +10,6 @@
SUBDIRS = 3rdparty/liborigin scidavis test
CONFIG+=ordered
-# Overwrite the qmake generated Makefile by the cmake one
-mxe {
-# urrgh! - maybe adding a qmake.pro file for liborigin might be better...
- system("cd 3rdparty/liborigin; rm CMakeCache.txt; cmake -DCMAKE_TOOLCHAIN_FILE=/scratch/rks/github/mxe/usr/i686-pc-mingw32.static/share/cmake/mxe-conf.cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_CXX_FLAGS:STRING=-DNO_CODE_GENERATION_FOR_LOG .")
-} else {
- system("cd 3rdparty/liborigin; rm CMakeCache.txt; cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_CXX_FLAGS:STRING=-DNO_CODE_GENERATION_FOR_LOG .")
-}
-
!mxe {
# optional fit plugins
SUBDIRS += fitPlugins/fitRational0\
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hp...@us...> - 2014-10-27 00:41:34
|
Revision: 1460
http://sourceforge.net/p/scidavis/svn/1460
Author: hpcoder
Date: 2014-10-27 00:41:29 +0000 (Mon, 27 Oct 2014)
Log Message:
-----------
liborigin support is optional now, by specifying qmake CONFIG+=liborigin
Modified Paths:
--------------
branches/development/config.pri
branches/development/scidavis.pro
Modified: branches/development/config.pri
===================================================================
--- branches/development/config.pri 2014-10-27 00:06:30 UTC (rev 1459)
+++ branches/development/config.pri 2014-10-27 00:41:29 UTC (rev 1460)
@@ -192,14 +192,19 @@
}
### support for Origin OPJ import using liborigin2
+mxe|osx_dist|aegis {
+CONFIG+=liborigin
+}
+liborigin {
DEFINES += ORIGIN_IMPORT
+}
################################################################################
### Dependencies #
################################################################################
# code for maintained branch of liborigin.
-contains(DEFINES, ORIGIN_IMPORT) {
+liborigin {
LIBS += ../3rdparty/liborigin/liborigin.a
INCLUDEPATH += ../3rdparty/liborigin
}
@@ -224,7 +229,7 @@
# }
}
-contains(PRESET, mac_dist) {
+osx_dist {
# Uses MacPorts supplied versions of the dependencies
INCLUDEPATH += /opt/local/include
@@ -239,11 +244,8 @@
LIBS += -lgsl -lgslcblas -lz
LIBS += -lmuparser -lpython2.7
-# contains(DEFINES, ORIGIN_IMPORT) {
-# LIBS += -L../3rdparty/liborigin2 -lorigin
-# INCLUDEPATH += ../3rdparty/liborigin2
-# }
-
+# this was an attempt to add a post build step. Doesn't seem to work,
+# so just run this step manually
QMAKE_EXTRA_TARGETS += mac-dist
mac-dist.commands = sh mkMacDist.sh
Modified: branches/development/scidavis.pro
===================================================================
--- branches/development/scidavis.pro 2014-10-27 00:06:30 UTC (rev 1459)
+++ branches/development/scidavis.pro 2014-10-27 00:41:29 UTC (rev 1460)
@@ -2,16 +2,26 @@
# SciDAVis main project file
# run "qmake scidavis.pro" to generate the Makefile
# In most cases you don't have to make changes to
-# this file but to the "scidavis.pro" file in the
-# "scidavis" subdirectory.
+# this file but to the "config.pri" file
#################################################
TEMPLATE = subdirs
-SUBDIRS = 3rdparty/liborigin scidavis test
+# configurations that automatically turn on liborigin - mainly the
+# binary releases, as well as the AEGIS build
+mxe|osx_dist|aegis {
+ CONFIG += liborigin
+}
+
+# liborigin must come first, if it exists
+liborigin {
+ SUBDIRS = 3rdparty/liborigin
+}
+SUBDIRS += scidavis test
CONFIG+=ordered
!mxe {
# optional fit plugins
+# mxe is a static build, so these are included elsewhere
SUBDIRS += fitPlugins/fitRational0\
fitPlugins/fitRational1\
fitPlugins/explin\
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hp...@us...> - 2014-10-27 07:18:07
|
Revision: 1461
http://sourceforge.net/p/scidavis/svn/1461
Author: hpcoder
Date: 2014-10-27 07:17:48 +0000 (Mon, 27 Oct 2014)
Log Message:
-----------
Reorganised source code such that most source code is located in a
library (libscidavis), to which the application and regression test
code link.
Modified Paths:
--------------
branches/development/config.pri
branches/development/scidavis/python.pri
branches/development/scidavis/scidavis.pro
branches/development/scidavis/translations/scidavis_cs-alt.ts
branches/development/scidavis/translations/scidavis_cs.ts
branches/development/scidavis/translations/scidavis_de.ts
branches/development/scidavis/translations/scidavis_es.ts
branches/development/scidavis/translations/scidavis_fr.ts
branches/development/scidavis/translations/scidavis_ja.ts
branches/development/scidavis/translations/scidavis_pt-br.ts
branches/development/scidavis/translations/scidavis_ru.ts
branches/development/scidavis/translations/scidavis_sv.ts
branches/development/scidavis.pro
branches/development/test/test.pro
Added Paths:
-----------
branches/development/libscidavis/
branches/development/libscidavis/muparser.pri
branches/development/libscidavis/python-sipcmd.py
branches/development/libscidavis/python.pri
branches/development/libscidavis/sourcefiles.pri
branches/development/libscidavis/src/
branches/development/libscidavis/src/ApplicationWindow.cpp
branches/development/libscidavis/src/ApplicationWindow.h
branches/development/libscidavis/src/ArrowMarker.cpp
branches/development/libscidavis/src/ArrowMarker.h
branches/development/libscidavis/src/AssociationsDialog.cpp
branches/development/libscidavis/src/AssociationsDialog.h
branches/development/libscidavis/src/AxesDialog.cpp
branches/development/libscidavis/src/AxesDialog.h
branches/development/libscidavis/src/Bar.cpp
branches/development/libscidavis/src/Bar.h
branches/development/libscidavis/src/BoxCurve.cpp
branches/development/libscidavis/src/BoxCurve.h
branches/development/libscidavis/src/CanvasPicker.cpp
branches/development/libscidavis/src/CanvasPicker.h
branches/development/libscidavis/src/ColorBox.cpp
branches/development/libscidavis/src/ColorBox.h
branches/development/libscidavis/src/ColorButton.cpp
branches/development/libscidavis/src/ColorButton.h
branches/development/libscidavis/src/ColorMapEditor.cpp
branches/development/libscidavis/src/ColorMapEditor.h
branches/development/libscidavis/src/Cone3D.cpp
branches/development/libscidavis/src/Cone3D.h
branches/development/libscidavis/src/ConfigDialog.cpp
branches/development/libscidavis/src/ConfigDialog.h
branches/development/libscidavis/src/Convolution.cpp
branches/development/libscidavis/src/Convolution.h
branches/development/libscidavis/src/Correlation.cpp
branches/development/libscidavis/src/Correlation.h
branches/development/libscidavis/src/CurveRangeDialog.cpp
branches/development/libscidavis/src/CurveRangeDialog.h
branches/development/libscidavis/src/CurvesDialog.cpp
branches/development/libscidavis/src/CurvesDialog.h
branches/development/libscidavis/src/DataPickerTool.cpp
branches/development/libscidavis/src/DataPickerTool.h
branches/development/libscidavis/src/DataPointPicker.cpp
branches/development/libscidavis/src/DataPointPicker.h
branches/development/libscidavis/src/DataSetDialog.cpp
branches/development/libscidavis/src/DataSetDialog.h
branches/development/libscidavis/src/Debug/
branches/development/libscidavis/src/Differentiation.cpp
branches/development/libscidavis/src/Differentiation.h
branches/development/libscidavis/src/ErrDialog.cpp
branches/development/libscidavis/src/ErrDialog.h
branches/development/libscidavis/src/ExpDecayDialog.cpp
branches/development/libscidavis/src/ExpDecayDialog.h
branches/development/libscidavis/src/ExponentialFit.cpp
branches/development/libscidavis/src/ExponentialFit.h
branches/development/libscidavis/src/ExportDialog.cpp
branches/development/libscidavis/src/ExportDialog.h
branches/development/libscidavis/src/ExtensibleFileDialog.cpp
branches/development/libscidavis/src/ExtensibleFileDialog.h
branches/development/libscidavis/src/FFT.cpp
branches/development/libscidavis/src/FFT.h
branches/development/libscidavis/src/FFTDialog.cpp
branches/development/libscidavis/src/FFTDialog.h
branches/development/libscidavis/src/FFTFilter.cpp
branches/development/libscidavis/src/FFTFilter.h
branches/development/libscidavis/src/Filter.cpp
branches/development/libscidavis/src/Filter.h
branches/development/libscidavis/src/FilterDialog.cpp
branches/development/libscidavis/src/FilterDialog.h
branches/development/libscidavis/src/FindDialog.cpp
branches/development/libscidavis/src/FindDialog.h
branches/development/libscidavis/src/Fit.cpp
branches/development/libscidavis/src/Fit.h
branches/development/libscidavis/src/FitDialog.cpp
branches/development/libscidavis/src/FitDialog.h
branches/development/libscidavis/src/Folder.cpp
branches/development/libscidavis/src/Folder.h
branches/development/libscidavis/src/FunctionCurve.cpp
branches/development/libscidavis/src/FunctionCurve.h
branches/development/libscidavis/src/FunctionDialog.cpp
branches/development/libscidavis/src/FunctionDialog.h
branches/development/libscidavis/src/Graph.cpp
branches/development/libscidavis/src/Graph.h
branches/development/libscidavis/src/Graph3D.cpp
branches/development/libscidavis/src/Graph3D.h
branches/development/libscidavis/src/Grid.cpp
branches/development/libscidavis/src/Grid.h
branches/development/libscidavis/src/ImageDialog.cpp
branches/development/libscidavis/src/ImageDialog.h
branches/development/libscidavis/src/ImageExportDialog.cpp
branches/development/libscidavis/src/ImageExportDialog.h
branches/development/libscidavis/src/ImageMarker.cpp
branches/development/libscidavis/src/ImageMarker.h
branches/development/libscidavis/src/ImportASCIIDialog.cpp
branches/development/libscidavis/src/ImportASCIIDialog.h
branches/development/libscidavis/src/IntDialog.cpp
branches/development/libscidavis/src/IntDialog.h
branches/development/libscidavis/src/Integration.cpp
branches/development/libscidavis/src/Integration.h
branches/development/libscidavis/src/Interpolation.cpp
branches/development/libscidavis/src/Interpolation.h
branches/development/libscidavis/src/InterpolationDialog.cpp
branches/development/libscidavis/src/InterpolationDialog.h
branches/development/libscidavis/src/LayerDialog.cpp
branches/development/libscidavis/src/LayerDialog.h
branches/development/libscidavis/src/Legend.cpp
branches/development/libscidavis/src/Legend.h
branches/development/libscidavis/src/LineDialog.cpp
branches/development/libscidavis/src/LineDialog.h
branches/development/libscidavis/src/LineProfileTool.cpp
branches/development/libscidavis/src/LineProfileTool.h
branches/development/libscidavis/src/Matrix.cpp
branches/development/libscidavis/src/Matrix.h
branches/development/libscidavis/src/MuParserScript.cpp
branches/development/libscidavis/src/MuParserScript.h
branches/development/libscidavis/src/MuParserScripting.cpp
branches/development/libscidavis/src/MuParserScripting.h
branches/development/libscidavis/src/MultiLayer.cpp
branches/development/libscidavis/src/MultiLayer.h
branches/development/libscidavis/src/MultiPeakFit.cpp
branches/development/libscidavis/src/MultiPeakFit.h
branches/development/libscidavis/src/MultiPeakFitTool.cpp
branches/development/libscidavis/src/MultiPeakFitTool.h
branches/development/libscidavis/src/MyParser.cpp
branches/development/libscidavis/src/MyParser.h
branches/development/libscidavis/src/MyWidget.cpp
branches/development/libscidavis/src/MyWidget.h
branches/development/libscidavis/src/NonLinearFit.cpp
branches/development/libscidavis/src/NonLinearFit.h
branches/development/libscidavis/src/Note.cpp
branches/development/libscidavis/src/Note.h
branches/development/libscidavis/src/OpenProjectDialog.cpp
branches/development/libscidavis/src/OpenProjectDialog.h
branches/development/libscidavis/src/PatternBox.cpp
branches/development/libscidavis/src/PatternBox.h
branches/development/libscidavis/src/Plot.cpp
branches/development/libscidavis/src/Plot.h
branches/development/libscidavis/src/Plot3DDialog.cpp
branches/development/libscidavis/src/Plot3DDialog.h
branches/development/libscidavis/src/PlotCurve.cpp
branches/development/libscidavis/src/PlotCurve.h
branches/development/libscidavis/src/PlotDialog.cpp
branches/development/libscidavis/src/PlotDialog.h
branches/development/libscidavis/src/PlotEnrichement.cpp
branches/development/libscidavis/src/PlotEnrichement.h
branches/development/libscidavis/src/PlotToolInterface.h
branches/development/libscidavis/src/PlotWizard.cpp
branches/development/libscidavis/src/PlotWizard.h
branches/development/libscidavis/src/PluginFit.cpp
branches/development/libscidavis/src/PluginFit.h
branches/development/libscidavis/src/PolynomFitDialog.cpp
branches/development/libscidavis/src/PolynomFitDialog.h
branches/development/libscidavis/src/PolynomialFit.cpp
branches/development/libscidavis/src/PolynomialFit.h
branches/development/libscidavis/src/PythonScript.cpp
branches/development/libscidavis/src/PythonScript.h
branches/development/libscidavis/src/PythonScripting.cpp
branches/development/libscidavis/src/PythonScripting.h
branches/development/libscidavis/src/QwtBarCurve.cpp
branches/development/libscidavis/src/QwtBarCurve.h
branches/development/libscidavis/src/QwtErrorPlotCurve.cpp
branches/development/libscidavis/src/QwtErrorPlotCurve.h
branches/development/libscidavis/src/QwtHistogram.cpp
branches/development/libscidavis/src/QwtHistogram.h
branches/development/libscidavis/src/QwtPieCurve.cpp
branches/development/libscidavis/src/QwtPieCurve.h
branches/development/libscidavis/src/RangeSelectorTool.cpp
branches/development/libscidavis/src/RangeSelectorTool.h
branches/development/libscidavis/src/RenameWindowDialog.cpp
branches/development/libscidavis/src/RenameWindowDialog.h
branches/development/libscidavis/src/ScaleDraw.cpp
branches/development/libscidavis/src/ScaleDraw.h
branches/development/libscidavis/src/ScalePicker.cpp
branches/development/libscidavis/src/ScalePicker.h
branches/development/libscidavis/src/SciDAVisAbout.ui
branches/development/libscidavis/src/ScreenPickerTool.cpp
branches/development/libscidavis/src/ScreenPickerTool.h
branches/development/libscidavis/src/Script.cpp
branches/development/libscidavis/src/Script.h
branches/development/libscidavis/src/ScriptEdit.cpp
branches/development/libscidavis/src/ScriptEdit.h
branches/development/libscidavis/src/ScriptingEnv.cpp
branches/development/libscidavis/src/ScriptingEnv.h
branches/development/libscidavis/src/ScriptingLangDialog.cpp
branches/development/libscidavis/src/ScriptingLangDialog.h
branches/development/libscidavis/src/SelectionMoveResizer.cpp
branches/development/libscidavis/src/SelectionMoveResizer.h
branches/development/libscidavis/src/SigmoidalFit.cpp
branches/development/libscidavis/src/SigmoidalFit.h
branches/development/libscidavis/src/SmoothCurveDialog.cpp
branches/development/libscidavis/src/SmoothCurveDialog.h
branches/development/libscidavis/src/SmoothFilter.cpp
branches/development/libscidavis/src/SmoothFilter.h
branches/development/libscidavis/src/Spectrogram.cpp
branches/development/libscidavis/src/Spectrogram.h
branches/development/libscidavis/src/SurfaceDialog.cpp
branches/development/libscidavis/src/SurfaceDialog.h
branches/development/libscidavis/src/SymbolBox.cpp
branches/development/libscidavis/src/SymbolBox.h
branches/development/libscidavis/src/SymbolDialog.cpp
branches/development/libscidavis/src/SymbolDialog.h
branches/development/libscidavis/src/Table.cpp
branches/development/libscidavis/src/Table.h
branches/development/libscidavis/src/TableStatistics.cpp
branches/development/libscidavis/src/TableStatistics.h
branches/development/libscidavis/src/TeXTableExportDialog.cpp
branches/development/libscidavis/src/TeXTableExportDialog.h
branches/development/libscidavis/src/TeXTableSettings.cpp
branches/development/libscidavis/src/TeXTableSettings.h
branches/development/libscidavis/src/TeXTableSettingsWidget.cpp
branches/development/libscidavis/src/TeXTableSettingsWidget.h
branches/development/libscidavis/src/TextDialog.cpp
branches/development/libscidavis/src/TextDialog.h
branches/development/libscidavis/src/TextFormatButtons.cpp
branches/development/libscidavis/src/TextFormatButtons.h
branches/development/libscidavis/src/TitlePicker.cpp
branches/development/libscidavis/src/TitlePicker.h
branches/development/libscidavis/src/TranslateCurveTool.cpp
branches/development/libscidavis/src/TranslateCurveTool.h
branches/development/libscidavis/src/VectorCurve.cpp
branches/development/libscidavis/src/VectorCurve.h
branches/development/libscidavis/src/customevents.h
branches/development/libscidavis/src/fit_gsl.cpp
branches/development/libscidavis/src/fit_gsl.h
branches/development/libscidavis/src/future/
branches/development/libscidavis/src/globals.cpp
branches/development/libscidavis/src/globals.h
branches/development/libscidavis/src/importOPJ.cpp
branches/development/libscidavis/src/importOPJ.h
branches/development/libscidavis/src/scidavis.sip
branches/development/libscidavis/src/version.cpp
branches/development/python-includepath.py
branches/development/python-libs-win.py
Removed Paths:
-------------
branches/development/scidavis/muparser.pri
branches/development/scidavis/python-includepath.py
branches/development/scidavis/python-libs-win.py
branches/development/scidavis/python-sipcmd.py
branches/development/scidavis/sourcefiles.pri
branches/development/scidavis/src/ApplicationWindow.cpp
branches/development/scidavis/src/ApplicationWindow.h
branches/development/scidavis/src/ArrowMarker.cpp
branches/development/scidavis/src/ArrowMarker.h
branches/development/scidavis/src/AssociationsDialog.cpp
branches/development/scidavis/src/AssociationsDialog.h
branches/development/scidavis/src/AxesDialog.cpp
branches/development/scidavis/src/AxesDialog.h
branches/development/scidavis/src/Bar.cpp
branches/development/scidavis/src/Bar.h
branches/development/scidavis/src/BoxCurve.cpp
branches/development/scidavis/src/BoxCurve.h
branches/development/scidavis/src/CanvasPicker.cpp
branches/development/scidavis/src/CanvasPicker.h
branches/development/scidavis/src/ColorBox.cpp
branches/development/scidavis/src/ColorBox.h
branches/development/scidavis/src/ColorButton.cpp
branches/development/scidavis/src/ColorButton.h
branches/development/scidavis/src/ColorMapEditor.cpp
branches/development/scidavis/src/ColorMapEditor.h
branches/development/scidavis/src/Cone3D.cpp
branches/development/scidavis/src/Cone3D.h
branches/development/scidavis/src/ConfigDialog.cpp
branches/development/scidavis/src/ConfigDialog.h
branches/development/scidavis/src/Convolution.cpp
branches/development/scidavis/src/Convolution.h
branches/development/scidavis/src/Correlation.cpp
branches/development/scidavis/src/Correlation.h
branches/development/scidavis/src/CurveRangeDialog.cpp
branches/development/scidavis/src/CurveRangeDialog.h
branches/development/scidavis/src/CurvesDialog.cpp
branches/development/scidavis/src/CurvesDialog.h
branches/development/scidavis/src/DataPickerTool.cpp
branches/development/scidavis/src/DataPickerTool.h
branches/development/scidavis/src/DataPointPicker.cpp
branches/development/scidavis/src/DataPointPicker.h
branches/development/scidavis/src/DataSetDialog.cpp
branches/development/scidavis/src/DataSetDialog.h
branches/development/scidavis/src/Debug/
branches/development/scidavis/src/Differentiation.cpp
branches/development/scidavis/src/Differentiation.h
branches/development/scidavis/src/ErrDialog.cpp
branches/development/scidavis/src/ErrDialog.h
branches/development/scidavis/src/ExpDecayDialog.cpp
branches/development/scidavis/src/ExpDecayDialog.h
branches/development/scidavis/src/ExponentialFit.cpp
branches/development/scidavis/src/ExponentialFit.h
branches/development/scidavis/src/ExportDialog.cpp
branches/development/scidavis/src/ExportDialog.h
branches/development/scidavis/src/ExtensibleFileDialog.cpp
branches/development/scidavis/src/ExtensibleFileDialog.h
branches/development/scidavis/src/FFT.cpp
branches/development/scidavis/src/FFT.h
branches/development/scidavis/src/FFTDialog.cpp
branches/development/scidavis/src/FFTDialog.h
branches/development/scidavis/src/FFTFilter.cpp
branches/development/scidavis/src/FFTFilter.h
branches/development/scidavis/src/Filter.cpp
branches/development/scidavis/src/Filter.h
branches/development/scidavis/src/FilterDialog.cpp
branches/development/scidavis/src/FilterDialog.h
branches/development/scidavis/src/FindDialog.cpp
branches/development/scidavis/src/FindDialog.h
branches/development/scidavis/src/Fit.cpp
branches/development/scidavis/src/Fit.h
branches/development/scidavis/src/FitDialog.cpp
branches/development/scidavis/src/FitDialog.h
branches/development/scidavis/src/Folder.cpp
branches/development/scidavis/src/Folder.h
branches/development/scidavis/src/FunctionCurve.cpp
branches/development/scidavis/src/FunctionCurve.h
branches/development/scidavis/src/FunctionDialog.cpp
branches/development/scidavis/src/FunctionDialog.h
branches/development/scidavis/src/Graph.cpp
branches/development/scidavis/src/Graph.h
branches/development/scidavis/src/Graph3D.cpp
branches/development/scidavis/src/Graph3D.h
branches/development/scidavis/src/Grid.cpp
branches/development/scidavis/src/Grid.h
branches/development/scidavis/src/ImageDialog.cpp
branches/development/scidavis/src/ImageDialog.h
branches/development/scidavis/src/ImageExportDialog.cpp
branches/development/scidavis/src/ImageExportDialog.h
branches/development/scidavis/src/ImageMarker.cpp
branches/development/scidavis/src/ImageMarker.h
branches/development/scidavis/src/ImportASCIIDialog.cpp
branches/development/scidavis/src/ImportASCIIDialog.h
branches/development/scidavis/src/IntDialog.cpp
branches/development/scidavis/src/IntDialog.h
branches/development/scidavis/src/Integration.cpp
branches/development/scidavis/src/Integration.h
branches/development/scidavis/src/Interpolation.cpp
branches/development/scidavis/src/Interpolation.h
branches/development/scidavis/src/InterpolationDialog.cpp
branches/development/scidavis/src/InterpolationDialog.h
branches/development/scidavis/src/LayerDialog.cpp
branches/development/scidavis/src/LayerDialog.h
branches/development/scidavis/src/Legend.cpp
branches/development/scidavis/src/Legend.h
branches/development/scidavis/src/LineDialog.cpp
branches/development/scidavis/src/LineDialog.h
branches/development/scidavis/src/LineProfileTool.cpp
branches/development/scidavis/src/LineProfileTool.h
branches/development/scidavis/src/Matrix.cpp
branches/development/scidavis/src/Matrix.h
branches/development/scidavis/src/MuParserScript.cpp
branches/development/scidavis/src/MuParserScript.h
branches/development/scidavis/src/MuParserScripting.cpp
branches/development/scidavis/src/MuParserScripting.h
branches/development/scidavis/src/MultiLayer.cpp
branches/development/scidavis/src/MultiLayer.h
branches/development/scidavis/src/MultiPeakFit.cpp
branches/development/scidavis/src/MultiPeakFit.h
branches/development/scidavis/src/MultiPeakFitTool.cpp
branches/development/scidavis/src/MultiPeakFitTool.h
branches/development/scidavis/src/MyParser.cpp
branches/development/scidavis/src/MyParser.h
branches/development/scidavis/src/MyWidget.cpp
branches/development/scidavis/src/MyWidget.h
branches/development/scidavis/src/NonLinearFit.cpp
branches/development/scidavis/src/NonLinearFit.h
branches/development/scidavis/src/Note.cpp
branches/development/scidavis/src/Note.h
branches/development/scidavis/src/OpenProjectDialog.cpp
branches/development/scidavis/src/OpenProjectDialog.h
branches/development/scidavis/src/PatternBox.cpp
branches/development/scidavis/src/PatternBox.h
branches/development/scidavis/src/Plot.cpp
branches/development/scidavis/src/Plot.h
branches/development/scidavis/src/Plot3DDialog.cpp
branches/development/scidavis/src/Plot3DDialog.h
branches/development/scidavis/src/PlotCurve.cpp
branches/development/scidavis/src/PlotCurve.h
branches/development/scidavis/src/PlotDialog.cpp
branches/development/scidavis/src/PlotDialog.h
branches/development/scidavis/src/PlotEnrichement.cpp
branches/development/scidavis/src/PlotEnrichement.h
branches/development/scidavis/src/PlotToolInterface.h
branches/development/scidavis/src/PlotWizard.cpp
branches/development/scidavis/src/PlotWizard.h
branches/development/scidavis/src/PluginFit.cpp
branches/development/scidavis/src/PluginFit.h
branches/development/scidavis/src/PolynomFitDialog.cpp
branches/development/scidavis/src/PolynomFitDialog.h
branches/development/scidavis/src/PolynomialFit.cpp
branches/development/scidavis/src/PolynomialFit.h
branches/development/scidavis/src/PythonScript.cpp
branches/development/scidavis/src/PythonScript.h
branches/development/scidavis/src/PythonScripting.cpp
branches/development/scidavis/src/PythonScripting.h
branches/development/scidavis/src/QwtBarCurve.cpp
branches/development/scidavis/src/QwtBarCurve.h
branches/development/scidavis/src/QwtErrorPlotCurve.cpp
branches/development/scidavis/src/QwtErrorPlotCurve.h
branches/development/scidavis/src/QwtHistogram.cpp
branches/development/scidavis/src/QwtHistogram.h
branches/development/scidavis/src/QwtPieCurve.cpp
branches/development/scidavis/src/QwtPieCurve.h
branches/development/scidavis/src/RangeSelectorTool.cpp
branches/development/scidavis/src/RangeSelectorTool.h
branches/development/scidavis/src/RenameWindowDialog.cpp
branches/development/scidavis/src/RenameWindowDialog.h
branches/development/scidavis/src/ScaleDraw.cpp
branches/development/scidavis/src/ScaleDraw.h
branches/development/scidavis/src/ScalePicker.cpp
branches/development/scidavis/src/ScalePicker.h
branches/development/scidavis/src/SciDAVisAbout.ui
branches/development/scidavis/src/ScreenPickerTool.cpp
branches/development/scidavis/src/ScreenPickerTool.h
branches/development/scidavis/src/Script.cpp
branches/development/scidavis/src/Script.h
branches/development/scidavis/src/ScriptEdit.cpp
branches/development/scidavis/src/ScriptEdit.h
branches/development/scidavis/src/ScriptingEnv.cpp
branches/development/scidavis/src/ScriptingEnv.h
branches/development/scidavis/src/ScriptingLangDialog.cpp
branches/development/scidavis/src/ScriptingLangDialog.h
branches/development/scidavis/src/SelectionMoveResizer.cpp
branches/development/scidavis/src/SelectionMoveResizer.h
branches/development/scidavis/src/SigmoidalFit.cpp
branches/development/scidavis/src/SigmoidalFit.h
branches/development/scidavis/src/SmoothCurveDialog.cpp
branches/development/scidavis/src/SmoothCurveDialog.h
branches/development/scidavis/src/SmoothFilter.cpp
branches/development/scidavis/src/SmoothFilter.h
branches/development/scidavis/src/Spectrogram.cpp
branches/development/scidavis/src/Spectrogram.h
branches/development/scidavis/src/SurfaceDialog.cpp
branches/development/scidavis/src/SurfaceDialog.h
branches/development/scidavis/src/SymbolBox.cpp
branches/development/scidavis/src/SymbolBox.h
branches/development/scidavis/src/SymbolDialog.cpp
branches/development/scidavis/src/SymbolDialog.h
branches/development/scidavis/src/Table.cpp
branches/development/scidavis/src/Table.h
branches/development/scidavis/src/TableStatistics.cpp
branches/development/scidavis/src/TableStatistics.h
branches/development/scidavis/src/TeXTableExportDialog.cpp
branches/development/scidavis/src/TeXTableExportDialog.h
branches/development/scidavis/src/TeXTableSettings.cpp
branches/development/scidavis/src/TeXTableSettings.h
branches/development/scidavis/src/TeXTableSettingsWidget.cpp
branches/development/scidavis/src/TeXTableSettingsWidget.h
branches/development/scidavis/src/TextDialog.cpp
branches/development/scidavis/src/TextDialog.h
branches/development/scidavis/src/TextFormatButtons.cpp
branches/development/scidavis/src/TextFormatButtons.h
branches/development/scidavis/src/TitlePicker.cpp
branches/development/scidavis/src/TitlePicker.h
branches/development/scidavis/src/TranslateCurveTool.cpp
branches/development/scidavis/src/TranslateCurveTool.h
branches/development/scidavis/src/VectorCurve.cpp
branches/development/scidavis/src/VectorCurve.h
branches/development/scidavis/src/customevents.h
branches/development/scidavis/src/fit_gsl.cpp
branches/development/scidavis/src/fit_gsl.h
branches/development/scidavis/src/future/
branches/development/scidavis/src/globals.cpp
branches/development/scidavis/src/globals.h
branches/development/scidavis/src/importOPJ.cpp
branches/development/scidavis/src/importOPJ.h
branches/development/scidavis/src/scidavis.sip
branches/development/scidavis/src/version.cpp
Modified: branches/development/config.pri
===================================================================
--- branches/development/config.pri 2014-10-27 00:41:29 UTC (rev 1460)
+++ branches/development/config.pri 2014-10-27 07:17:48 UTC (rev 1461)
@@ -183,14 +183,6 @@
DEFINES += DOWNLOAD_LINKS
}
-### (remark: muparser.pri and python.pri must be included after defining INSTALLBASE )
-### building without muParser does not work yet (but will in a future version)
-include( ../scidavis/muparser.pri )
-### comment out the following line to deactivate Python scripting support
-!mxe {
-include( ../scidavis/python.pri )
-}
-
### support for Origin OPJ import using liborigin2
mxe|osx_dist|aegis {
CONFIG+=liborigin
@@ -199,15 +191,16 @@
DEFINES += ORIGIN_IMPORT
}
+### python support
+osx_dist|aegis {
+CONFIG+=python
+}
+
################################################################################
### Dependencies #
################################################################################
# code for maintained branch of liborigin.
-liborigin {
- LIBS += ../3rdparty/liborigin/liborigin.a
- INCLUDEPATH += ../3rdparty/liborigin
- }
contains(PRESET, default_installation) {
### Link statically against Qwt and Qwtplot3D (in order to make sure they
@@ -223,10 +216,6 @@
LIBS += -lgsl -lgslcblas -lz -lGLU
LIBS += -lmuparser
-# contains(DEFINES, ORIGIN_IMPORT) {
-# LIBS += -L../3rdparty/liborigin -lorigin
-# INCLUDEPATH += ../3rdparty/liborigin
-# }
}
osx_dist {
@@ -274,10 +263,6 @@
LIBS += -lgsl -lgslcblas
LIBS += -lmuparser
-# contains(DEFINES, ORIGIN_IMPORT) {
-# LIBS += -L../3rdparty/liborigin -lorigin
-# INCLUDEPATH += ../3rdparty/liborigin
-# }
}
contains(PRESET, self_contained) {
@@ -294,10 +279,6 @@
LIBS += /usr/lib/libgsl.a /usr/lib/libgslcblas.a
-# contains(DEFINES, ORIGIN_IMPORT) {
-# LIBS += ../3rdparty/liborigin/build/liborigin.a
-# INCLUDEPATH += ../3rdparty/liborigin ../3rdparty/liborigin/build
-# }
}
win32: {
Copied: branches/development/libscidavis/muparser.pri (from rev 1451, branches/development/scidavis/muparser.pri)
===================================================================
--- branches/development/libscidavis/muparser.pri (rev 0)
+++ branches/development/libscidavis/muparser.pri 2014-10-27 07:17:48 UTC (rev 1461)
@@ -0,0 +1,8 @@
+DEFINES += SCRIPTING_MUPARSER
+
+HEADERS += src/MuParserScript.h \
+ src/MuParserScripting.h \
+
+SOURCES += src/MuParserScript.cpp \
+ src/MuParserScripting.cpp \
+
Copied: branches/development/libscidavis/python-sipcmd.py (from rev 1451, branches/development/scidavis/python-sipcmd.py)
===================================================================
--- branches/development/libscidavis/python-sipcmd.py (rev 0)
+++ branches/development/libscidavis/python-sipcmd.py 2014-10-27 07:17:48 UTC (rev 1461)
@@ -0,0 +1,36 @@
+#!/usr/bin/python
+
+############################################################################
+# #
+# File : python-sipcmd.py #
+# Project : SciDAVis #
+# Description : Auto-detect SIP/PyQt location; dump commandline #
+# Copyright : (C) 2007-2010 Knut Franke (knut.franke*gmx.de) #
+# (replace * with @ in the email address) #
+# #
+############################################################################
+# #
+# This program is free software; you can redistribute it and/or modify #
+# it under the term...
[truncated message content] |
|
From: <hp...@us...> - 2015-01-21 06:40:04
|
Revision: 1466
http://sourceforge.net/p/scidavis/svn/1466
Author: hpcoder
Date: 2015-01-21 06:39:51 +0000 (Wed, 21 Jan 2015)
Log Message:
-----------
Fixed up the build rule for translations now that sources have been
moved into libscidavis.
Modified Paths:
--------------
branches/development/libscidavis/libscidavis.pro
branches/development/libscidavis/src/ApplicationWindow.cpp
branches/development/scidavis/basic.pri
branches/development/scidavis/scidavis.pro
branches/development/scidavis/translations/scidavis_cs-alt.ts
branches/development/scidavis/translations/scidavis_cs.ts
branches/development/scidavis/translations/scidavis_de.ts
branches/development/scidavis/translations/scidavis_es.ts
branches/development/scidavis/translations/scidavis_fr.ts
branches/development/scidavis/translations/scidavis_ja.ts
branches/development/scidavis/translations/scidavis_pt-br.ts
branches/development/scidavis/translations/scidavis_ru.ts
branches/development/scidavis/translations/scidavis_sv.ts
branches/development/test/test.pro
Modified: branches/development/libscidavis/libscidavis.pro
===================================================================
--- branches/development/libscidavis/libscidavis.pro 2014-10-27 14:15:51 UTC (rev 1465)
+++ branches/development/libscidavis/libscidavis.pro 2015-01-21 06:39:51 UTC (rev 1466)
@@ -4,6 +4,8 @@
include(../config.pri)
+INCLUDEPATH += ../scidavis
+
liborigin {
INCLUDEPATH += ../3rdparty/liborigin
}
@@ -32,5 +34,7 @@
include( muparser.pri )
python {include( python.pri )}
+
+
#############################################################################
#############################################################################
Modified: branches/development/libscidavis/src/ApplicationWindow.cpp
===================================================================
--- branches/development/libscidavis/src/ApplicationWindow.cpp 2014-10-27 14:15:51 UTC (rev 1465)
+++ branches/development/libscidavis/src/ApplicationWindow.cpp 2015-01-21 06:39:51 UTC (rev 1466)
@@ -11973,6 +11973,7 @@
qApp->installTranslator(qtTranslator);
QString qmPath = TS_PATH;
+
QDir dir(qmPath);
QStringList fileNames = dir.entryList("scidavis_*.qm");
for (int i=0; i < (int)fileNames.size(); i++)
Modified: branches/development/scidavis/basic.pri
===================================================================
--- branches/development/scidavis/basic.pri 2014-10-27 14:15:51 UTC (rev 1465)
+++ branches/development/scidavis/basic.pri 2015-01-21 06:39:51 UTC (rev 1466)
@@ -67,7 +67,8 @@
win32: tstarget.target = translations\scidavis_de.qm
# note the translation files are not writable during AEGIS
# integration, so we don't want to perform an update then
- tstarget.commands = (! test -w translations/scidavis_de.ts || $$LUPDATE_BIN scidavis.pro) && $$LRELEASE_BIN scidavis.pro
+ tstarget.commands = (! test -w translations/scidavis_de.ts || \
+$$LUPDATE_BIN ../libscidavis/src/*.cpp -ts translations/*.ts) && $$LRELEASE_BIN translations/*.ts
QMAKE_EXTRA_TARGETS += tstarget
QMAKE_CLEAN += $$translationfiles.files
Modified: branches/development/scidavis/scidavis.pro
===================================================================
--- branches/development/scidavis/scidavis.pro 2014-10-27 14:15:51 UTC (rev 1465)
+++ branches/development/scidavis/scidavis.pro 2015-01-21 06:39:51 UTC (rev 1466)
@@ -10,7 +10,6 @@
LIBS += ../3rdparty/liborigin/liborigin.a
}
-
########### Future code backported from the aspect framework ##################
DEFINES += LEGACY_CODE_0_2_x
INCLUDEPATH += ../libscidavis/src/future
Modified: branches/development/scidavis/translations/scidavis_cs-alt.ts
===================================================================
--- branches/development/scidavis/translations/scidavis_cs-alt.ts 2014-10-27 14:15:51 UTC (rev 1465)
+++ branches/development/scidavis/translations/scidavis_cs-alt.ts 2015-01-21 06:39:51 UTC (rev 1466)
@@ -92,2629 +92,3883 @@
<context>
<name>ApplicationWindow</name>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="392"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="681"/>
<source>File</source>
- <translation type="obsolete">Soubor</translation>
+ <translation type="unfinished">Soubor</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="570"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="679"/>
<source>Plot</source>
- <translation type="obsolete">Graf</translation>
+ <translation type="unfinished">Graf</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11367"/>
<source>Pointer</source>
- <translation type="obsolete">Kurzor</translation>
+ <translation type="unfinished">Kurzor</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11383"/>
<source>Select data range</source>
- <translation type="obsolete">Zvolit rozsah dat</translation>
+ <translation type="unfinished">Zvolit rozsah dat</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11390"/>
<source>Move data points</source>
- <translation type="obsolete">Přesunout datové body</translation>
+ <translation type="unfinished">Přesunout datové body</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11394"/>
<source>Remove data points</source>
- <translation type="obsolete">Odstranit datové body</translation>
+ <translation type="unfinished">Odstranit datové body</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11406"/>
<source>Draw line</source>
- <translation type="obsolete">Nakreslit čáru</translation>
+ <translation type="unfinished">Nakreslit čáru</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="621"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="678"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="2479"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="2491"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="2698"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="7180"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13059"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13103"/>
<source>Table</source>
- <translation type="obsolete">Tabulka</translation>
+ <translation type="unfinished">Tabulka</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="1050"/>
<source>&File</source>
- <translation type="obsolete">&Soubor</translation>
+ <translation type="unfinished">&Soubor</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="686"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="720"/>
<source>&New</source>
- <translation type="obsolete">&Nový</translation>
+ <translation type="unfinished">&Nový</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="688"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="745"/>
<source>&Export Graph</source>
- <translation type="obsolete">&Exportovat graf</translation>
+ <translation type="unfinished">&Exportovat graf</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="1051"/>
<source>&Edit</source>
- <translation type="obsolete">&Upravit</translation>
+ <translation type="unfinished">&Upravit</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="1052"/>
<source>&View</source>
- <translation type="obsolete">&Pohled</translation>
+ <translation type="unfinished">&Pohled</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="1076"/>
<source>&Graph</source>
- <translation type="obsolete">&Graf</translation>
+ <translation type="unfinished">&Graf</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="1142"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="5852"/>
<source>&Matrix</source>
- <translation type="obsolete">&Matice</translation>
+ <translation type="unfinished">&Matice</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="690"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="991"/>
<source>Special Line/Symb&ol</source>
- <translation type="obsolete">Speciální čára/symb&ol</translation>
+ <translation type="unfinished">Speciální čára/symb&ol</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="691"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="1007"/>
<source>Statistical &Graphs</source>
- <translation type="obsolete">Statistické& grafy</translation>
+ <translation type="unfinished">Statistické& grafy</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="692"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="1013"/>
<source>Pa&nel</source>
- <translation type="obsolete">Pa&nel</translation>
+ <translation type="unfinished">Pa&nel</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="698"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="896"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="7956"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="8072"/>
<source>Fit E&xponential Decay</source>
- <translation type="obsolete">Proložit e&xponenciálním poklesem</translation>
+ <translation type="unfinished">Proložit e&xponenciálním poklesem</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="1078"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="1117"/>
<source>&Analysis</source>
- <translation type="obsolete">Ana&lýza</translation>
+ <translation type="unfinished">Ana&lýza</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="1079"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="1099"/>
<source>For&mat</source>
- <translation type="obsolete">For&mát</translation>
+ <translation type="unfinished">For&mát</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="1163"/>
<source>&Windows</source>
- <translation type="obsolete">&Okna</translation>
+ <translation type="unfinished">&Okna</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="1168"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10812"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11291"/>
<source>&Help</source>
- <translation type="obsolete">&Nápověda</translation>
+ <translation type="unfinished">&Nápověda</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="1705"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="8328"/>
<source><h4>There are no tables available in this project.</h4><p><h4>Please create a table and try again!</h4></source>
- <translation type="obsolete"><h4>V tomto projektu nejsou žádné tabulky.</h4><p><h4>Vytvořte prosím tabulku a zkuste znovu.</h4></translation>
+ <translation type="unfinished"><h4>V tomto projektu nejsou žádné tabulky.</h4><p><h4>Vytvořte prosím tabulku a zkuste znovu.</h4></translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="1741"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="1778"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="2634"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="2635"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="9106"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13055"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13098"/>
<source>Matrix</source>
- <translation type="obsolete">Matice</translation>
+ <translation type="unfinished">Matice</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="7571"/>
<source>Normal</source>
- <translation type="obsolete">Normální</translation>
+ <translation type="unfinished">Normální</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="2843"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="5247"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="6058"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="6125"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="6170"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="6593"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="6650"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="6681"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="6700"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="6741"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="6769"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="6807"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="6831"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="8416"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11731"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11766"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11811"/>
<source><h4>There are no plot layers available in this window.</h4><p><h4>Please add a layer and try again!</h4></source>
- <translation type="obsolete"><h4>V okně nejsou k dispozici žádné vrstvy s grafy.</h4><p><h4>Přidejte vrstvu a zkuste znovu.</h4></translation>
+ <translation type="unfinished"><h4>V okně nejsou k dispozici žádné vrstvy s grafy.</h4><p><h4>Přidejte vrstvu a zkuste znovu.</h4></translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="2887"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="2934"/>
<source>This feature is not available for user defined function curves!</source>
- <translation type="obsolete">Tato funkce není dostupná pro uživatelsky definované křivkyfunkcí!</translation>
+ <translation type="unfinished">Tato funkce není dostupná pro uživatelsky definované křivkyfunkcí!</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="4709"/>
<source><h4>There are no plot layers available in this window!</h4></source>
- <translation type="obsolete"><h4>V tomto okně nejsou k dispozici žádné vrstvy s grafy!</h4></translation>
+ <translation type="unfinished"><h4>V tomto okně nejsou k dispozici žádné vrstvy s grafy!</h4></translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="4863"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="5475"/>
<source>A file called: <p><b>%1</b><p>already exists. Do you want to overwrite it?</source>
- <translation type="obsolete">Soubor nazvaný <p><b>%1</b><p>již existuje. Chcete ho přepsat?</translation>
+ <translation type="unfinished">Soubor nazvaný <p><b>%1</b><p>již existuje. Chcete ho přepsat?</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="4864"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="5476"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13433"/>
<source>&Yes</source>
- <translation type="obsolete">&Ano</translation>
+ <translation type="unfinished">&Ano</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="4864"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="5476"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10573"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11133"/>
<source>&All</source>
- <translation type="obsolete">&Vše</translation>
+ <translation type="unfinished">&Vše</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="4864"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="5476"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="6729"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="9132"/>
<source>&Cancel</source>
- <translation type="obsolete">&Zrušit</translation>
+ <translation type="unfinished">&Zrušit</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13433"/>
<source>&No</source>
- <translation type="obsolete">&Ne</translation>
+ <translation type="unfinished">&Ne</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="5750"/>
<source>Not available for empty 3D surface plots!</source>
- <translation type="obsolete">Není k dispozici pro prázdné 3D povrchové grafy!</translation>
+ <translation type="unfinished">Není k dispozici pro prázdné 3D povrchové grafy!</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="6104"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="6215"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="6250"/>
<source><h4>There are no plot layers available in this window.</h4></source>
- <translation type="obsolete"><h4>V okně nejsou k dispozici žádné vrstvy s grafy.</h4></translation>
+ <translation type="unfinished"><h4>V okně nejsou k dispozici žádné vrstvy s grafy.</h4></translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="6565"/>
<source>Sorry, there are no results to display!</source>
- <translation type="obsolete">Žádné výsledky k zobrazen!</translation>
+ <translation type="unfinished">Žádné výsledky k zobrazen!</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="6728"/>
<source>Do you want to add the text on a new layer or on the active layer?</source>
- <translation type="obsolete">Chcete přidat text do nové vrstvy nebo do aktivní vrstvy?</translation>
+ <translation type="unfinished">Chcete přidat text do nové vrstvy nebo do aktivní vrstvy?</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="6729"/>
<source>On &New Layer</source>
- <translation type="obsolete">Do &nové vrstvy</translation>
+ <translation type="unfinished">Do &nové vrstvy</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="6729"/>
<source>On &Active Layer</source>
- <translation type="obsolete">Do &aktivní vrstvy</translation>
+ <translation type="unfinished">Do &aktivní vrstvy</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="7160"/>
<source>There are no windows available in this project!</source>
- <translation type="obsolete">V projektu nejsou k dispozici žádná okna!</translation>
+ <translation type="unfinished">V projektu nejsou k dispozici žádná okna!</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="7534"/>
<source>&Intensity Matrix</source>
- <translation type="obsolete">&Intenzitní matice</translation>
+ <translation type="unfinished">&Intenzitní matice</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="7538"/>
<source>&Cut</source>
- <translation type="obsolete">&Vyjmout</translation>
+ <translation type="unfinished">&Vyjmout</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="7539"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="7988"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="8104"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="8194"/>
<source>&Copy</source>
- <translation type="obsolete">&Kopírovat</translation>
+ <translation type="unfinished">&Kopírovat</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="7540"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10989"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11012"/>
<source>&Delete</source>
- <translation type="obsolete">&Smazat</translation>
+ <translation type="unfinished">&Smazat</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10847"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10850"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10853"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11311"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11312"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11313"/>
<source>&Properties</source>
- <translation type="obsolete">&Vlastnosti</translation>
+ <translation type="unfinished">&Vlastnosti</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="7555"/>
<source>Please use the project explorer to select a window!</source>
- <translation type="obsolete">Použijte prosím průzkumníka projektu k vybrání okna!</translation>
+ <translation type="unfinished">Použijte prosím průzkumníka projektu k vybrání okna!</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="8233"/>
<source>There is no file called <b>index.html</b> in this folder.<br>Please choose another folder!</source>
- <translation type="obsolete">Soubor nazvaný <b>index.html</b> ve složce nenalezen.<br>Zvolte prosím jinou složku!</translation>
+ <translation type="unfinished">Soubor nazvaný <b>index.html</b> ve složce nenalezen.<br>Zvolte prosím jinou složku!</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11412"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11413"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11414"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11415"/>
<source>Box</source>
- <translation type="obsolete">Krabice</translation>
+ <translation type="unfinished">Krabice</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11416"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11418"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11419"/>
<source>Frame</source>
- <translation type="obsolete">Rám</translation>
+ <translation type="unfinished">Rám</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11417"/>
<source>&Frame</source>
- <translation type="obsolete">&Rám</translation>
+ <translation type="unfinished">&Rám</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11420"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11421"/>
<source>No Axes</source>
- <translation type="obsolete">Žádné osy</translation>
+ <translation type="unfinished">Žádné osy</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11432"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11433"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11434"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11435"/>
<source>Wireframe</source>
- <translation type="obsolete">Drátový model</translation>
+ <translation type="unfinished">Drátový model</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11436"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11437"/>
<source>Hidden Line</source>
- <translation type="obsolete">Skryté čáry</translation>
+ <translation type="unfinished">Skryté čáry</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11442"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11443"/>
<source>Polygon only</source>
- <translation type="obsolete">Jen polygony</translation>
+ <translation type="unfinished">Jen polygony</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11446"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11447"/>
<source>Mesh & filled Polygons</source>
- <translation type="obsolete">Síť & vyplněné polygony</translation>
+ <translation type="unfinished">Síť & vyplněné polygony</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11448"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11449"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11450"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11451"/>
<source>Dots</source>
- <translation type="obsolete">Body</translation>
+ <translation type="unfinished">Body</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11452"/>
+ <location filename="../../libscidavis/src/Applicatio...
[truncated message content] |
|
From: <hp...@us...> - 2015-01-23 06:10:59
|
Revision: 1468
http://sourceforge.net/p/scidavis/svn/1468
Author: hpcoder
Date: 2015-01-23 06:10:52 +0000 (Fri, 23 Jan 2015)
Log Message:
-----------
Added dependencies of scidavis and test project on libscidavis.a
For ticket #258
Modified Paths:
--------------
branches/development/scidavis/scidavis.pro
branches/development/test/test.pro
Modified: branches/development/scidavis/scidavis.pro
===================================================================
--- branches/development/scidavis/scidavis.pro 2015-01-22 17:39:05 UTC (rev 1467)
+++ branches/development/scidavis/scidavis.pro 2015-01-23 06:10:52 UTC (rev 1468)
@@ -1,6 +1,8 @@
INCLUDEPATH += ../libscidavis ../libscidavis/src
LIBS += -L ../libscidavis -lscidavis
+POST_TARGETDEPS=../libscidavis/libscidavis.a
+
include(../config.pri)
include( basic.pri )
python {include( python.pri )}
@@ -8,6 +10,7 @@
liborigin {
LIBS += ../3rdparty/liborigin/liborigin.a
+ POST_TARGETDEPS += ../3rdparty/liborigin/liborigin.a
}
########### Future code backported from the aspect framework ##################
Modified: branches/development/test/test.pro
===================================================================
--- branches/development/test/test.pro 2015-01-22 17:39:05 UTC (rev 1467)
+++ branches/development/test/test.pro 2015-01-23 06:10:52 UTC (rev 1468)
@@ -8,6 +8,7 @@
INCLUDEPATH += . ../libscidavis ../libscidavis/src ../tmp/scidavis ../scidavis
LIBS += -L ../libscidavis -lscidavis
+POST_TARGETDEPS=../libscidavis/libscidavis.a
CONFIG += qt warn_on exceptions opengl thread zlib
CONFIG += assistant
@@ -20,6 +21,7 @@
liborigin {
LIBS += ../3rdparty/liborigin/liborigin.a
+ POST_TARGETDEPS += ../3rdparty/liborigin/liborigin.a
}
QT+=testlib
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hp...@us...> - 2015-01-24 04:05:57
|
Revision: 1469
http://sourceforge.net/p/scidavis/svn/1469
Author: hpcoder
Date: 2015-01-24 04:05:45 +0000 (Sat, 24 Jan 2015)
Log Message:
-----------
For reason we now need to add CONFIG+=uic to libscidavis??
Modified Paths:
--------------
branches/development/libscidavis/libscidavis.pro
branches/development/scidavis/scidavis.pro
branches/development/scidavis/translations/scidavis_cs-alt.ts
branches/development/scidavis/translations/scidavis_cs.ts
branches/development/scidavis/translations/scidavis_de.ts
branches/development/scidavis/translations/scidavis_es.ts
branches/development/scidavis/translations/scidavis_fr.ts
branches/development/scidavis/translations/scidavis_ja.ts
branches/development/scidavis/translations/scidavis_ru.ts
branches/development/scidavis/translations/scidavis_sv.ts
Modified: branches/development/libscidavis/libscidavis.pro
===================================================================
--- branches/development/libscidavis/libscidavis.pro 2015-01-23 06:10:52 UTC (rev 1468)
+++ branches/development/libscidavis/libscidavis.pro 2015-01-24 04:05:45 UTC (rev 1469)
@@ -1,5 +1,5 @@
TEMPLATE=lib
-CONFIG+=staticlib
+CONFIG+=staticlib uic
TARGET=scidavis
include(../config.pri)
Modified: branches/development/scidavis/scidavis.pro
===================================================================
--- branches/development/scidavis/scidavis.pro 2015-01-23 06:10:52 UTC (rev 1468)
+++ branches/development/scidavis/scidavis.pro 2015-01-24 04:05:45 UTC (rev 1469)
@@ -7,7 +7,6 @@
include( basic.pri )
python {include( python.pri )}
-
liborigin {
LIBS += ../3rdparty/liborigin/liborigin.a
POST_TARGETDEPS += ../3rdparty/liborigin/liborigin.a
Modified: branches/development/scidavis/translations/scidavis_cs-alt.ts
===================================================================
--- branches/development/scidavis/translations/scidavis_cs-alt.ts 2015-01-23 06:10:52 UTC (rev 1468)
+++ branches/development/scidavis/translations/scidavis_cs-alt.ts 2015-01-24 04:05:45 UTC (rev 1469)
@@ -5815,34 +5815,34 @@
<translation type="unfinished">Vyberte bod a dvojklikem ho smažete!</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="305"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="312"/>
<source>Sorry, but removing points of a function is not possible.</source>
<translation type="unfinished">Mazání bodů funkce není bohužel možné.</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="368"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="375"/>
<source>Sorry, but moving points of a function is not possible.</source>
<translation type="unfinished">Přesun bodů funkce není bohužel možný.</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="321"/>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="388"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="328"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="395"/>
<source>This operation cannot be performed on curves plotted from columns having a non-numerical format.</source>
<translation type="unfinished">Tato operace nemůže být provedena na křivkách vykreslených ze sloupců s nečíselným formátem.</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="304"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="311"/>
<source>Remove point error</source>
<translation type="unfinished">Chyba při odstraňování bodu</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="320"/>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="387"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="327"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="394"/>
<source>Warning</source>
<translation type="unfinished">Varování</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="367"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="374"/>
<source>Move point error</source>
<translation type="unfinished">Chyba přip řesunu bodu</translation>
</message>
Modified: branches/development/scidavis/translations/scidavis_cs.ts
===================================================================
--- branches/development/scidavis/translations/scidavis_cs.ts 2015-01-23 06:10:52 UTC (rev 1468)
+++ branches/development/scidavis/translations/scidavis_cs.ts 2015-01-24 04:05:45 UTC (rev 1469)
@@ -8285,7 +8285,7 @@
<translation type="obsolete">QtiPlot - Fehler beim Punkte entfernen</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="305"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="312"/>
<source>Sorry, but removing points of a function is not possible.</source>
<translation type="unfinished">Promiňte, ale odstranění bodů z funkce není možné.</translation>
</message>
@@ -8294,7 +8294,7 @@
<translation type="obsolete">QtiPlot - Fehler beim Punkte verschieben</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="368"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="375"/>
<source>Sorry, but moving points of a function is not possible.</source>
<translation type="unfinished">Promiňte, ale přesun bodů funkce není možný.</translation>
</message>
@@ -8303,24 +8303,24 @@
<translation type="obsolete">QtiPlot - Warnung</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="321"/>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="388"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="328"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="395"/>
<source>This operation cannot be performed on curves plotted from columns having a non-numerical format.</source>
<translation type="unfinished">Tuto operaci nelze provést na křivkách nakreslených ze sloupců, které nemají číselný formát.</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="304"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="311"/>
<source>Remove point error</source>
<translation type="unfinished">Chyba při odstranění bodů</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="320"/>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="387"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="327"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="394"/>
<source>Warning</source>
<translation type="unfinished">Varování</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="367"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="374"/>
<source>Move point error</source>
<translation type="unfinished">Chyba při přesunu bodů</translation>
</message>
Modified: branches/development/scidavis/translations/scidavis_de.ts
===================================================================
--- branches/development/scidavis/translations/scidavis_de.ts 2015-01-23 06:10:52 UTC (rev 1468)
+++ branches/development/scidavis/translations/scidavis_de.ts 2015-01-24 04:05:45 UTC (rev 1469)
@@ -8279,7 +8279,7 @@
<translation type="obsolete">QtiPlot - Fehler beim Punkte entfernen</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="305"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="312"/>
<source>Sorry, but removing points of a function is not possible.</source>
<translation type="unfinished">Das Entfernen von Punkten einer Funktion is leider nicht möglich.</translation>
</message>
@@ -8288,7 +8288,7 @@
<translation type="obsolete">QtiPlot - Fehler beim Punkte verschieben</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="368"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="375"/>
<source>Sorry, but moving points of a function is not possible.</source>
<translation type="unfinished">Das Bewegen von Punkten einer Funktion is leider nicht möglich.</translation>
</message>
@@ -8297,24 +8297,24 @@
<translation type="obsolete">QtiPlot - Warnung</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="321"/>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="388"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="328"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="395"/>
<source>This operation cannot be performed on curves plotted from columns having a non-numerical format.</source>
<translation type="unfinished">Diese Operation kann nicht auf Kurven angewendet werden, die auf Spalten mit nicht-numerischem Format basieren.</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="304"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="311"/>
<source>Remove point error</source>
<translation type="unfinished">Fehler beim Datenpunkte Entfernen</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="320"/>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="387"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="327"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="394"/>
<source>Warning</source>
<translation type="unfinished">Warnung</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="367"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="374"/>
<source>Move point error</source>
<translation type="unfinished">Fehler beim Datenpunkte Verschieben</translation>
</message>
Modified: branches/development/scidavis/translations/scidavis_es.ts
===================================================================
--- branches/development/scidavis/translations/scidavis_es.ts 2015-01-23 06:10:52 UTC (rev 1468)
+++ branches/development/scidavis/translations/scidavis_es.ts 2015-01-24 04:05:45 UTC (rev 1469)
@@ -7716,7 +7716,7 @@
<translation type="obsolete">QtiPlot - Quitar error del punto</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="305"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="312"/>
<source>Sorry, but removing points of a function is not possible.</source>
<translation type="unfinished">Perdón, pero no es posible borrar puntos de una función. </translation>
</message>
@@ -7725,7 +7725,7 @@
<translation type="obsolete">QtiPlot - Error Moviendo Punto</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="368"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="375"/>
<source>Sorry, but moving points of a function is not possible.</source>
<translation type="unfinished">Perdón, pero no es posible mover puntos de una función. </translation>
</message>
@@ -7734,24 +7734,24 @@
<translation type="obsolete">QtiPlot- Aviso</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="321"/>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="388"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="328"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="395"/>
<source>This operation cannot be performed on curves plotted from columns having a non-numerical format.</source>
<translation type="unfinished">Esta operación no puede ser realizada en curvas dibujadas a partir de columnas con un formato no numérico.</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="304"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="311"/>
<source>Remove point error</source>
<translation type="unfinished">Error al borrar punto</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="320"/>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="387"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="327"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="394"/>
<source>Warning</source>
<translation type="unfinished">Atención</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="367"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="374"/>
<source>Move point error</source>
<translation type="unfinished">Error al mover punto</translation>
</message>
Modified: branches/development/scidavis/translations/scidavis_fr.ts
===================================================================
--- branches/development/scidavis/translations/scidavis_fr.ts 2015-01-23 06:10:52 UTC (rev 1468)
+++ branches/development/scidavis/translations/scidavis_fr.ts 2015-01-24 04:05:45 UTC (rev 1469)
@@ -7600,22 +7600,22 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="304"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="311"/>
<source>Remove point error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="305"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="312"/>
<source>Sorry, but removing points of a function is not possible.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="367"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="374"/>
<source>Move point error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="368"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="375"/>
<source>Sorry, but moving points of a function is not possible.</source>
<translation type="unfinished"></translation>
</message>
@@ -7628,14 +7628,14 @@
<translation type="obsolete">QtiPlot - Déplacer l'erreur de point</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="321"/>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="388"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="328"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="395"/>
<source>This operation cannot be performed on curves plotted from columns having a non-numerical format.</source>
<translation type="unfinished">Cette opération ne peut être réalisée sur des courbes ayant des colonnes au format non numérique.</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="320"/>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="387"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="327"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="394"/>
<source>Warning</source>
<translation type="unfinished">Attention</translation>
</message>
Modified: branches/development/scidavis/translations/scidavis_ja.ts
===================================================================
--- branches/development/scidavis/translations/scidavis_ja.ts 2015-01-23 06:10:52 UTC (rev 1468)
+++ branches/development/scidavis/translations/scidavis_ja.ts 2015-01-24 04:05:45 UTC (rev 1469)
@@ -5661,34 +5661,34 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="304"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="311"/>
<source>Remove point error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="305"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="312"/>
<source>Sorry, but removing points of a function is not possible.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="320"/>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="387"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="327"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="394"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="321"/>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="388"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="328"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="395"/>
<source>This operation cannot be performed on curves plotted from columns having a non-numerical format.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="367"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="374"/>
<source>Move point error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="368"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="375"/>
<source>Sorry, but moving points of a function is not possible.</source>
<translation type="unfinished"></translation>
</message>
Modified: branches/development/scidavis/translations/scidavis_ru.ts
===================================================================
--- branches/development/scidavis/translations/scidavis_ru.ts 2015-01-23 06:10:52 UTC (rev 1468)
+++ branches/development/scidavis/translations/scidavis_ru.ts 2015-01-24 04:05:45 UTC (rev 1469)
@@ -7525,7 +7525,7 @@
<translation type="obsolete">QtiPlot - Ошибка удаления данных</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="305"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="312"/>
<source>Sorry, but removing points of a function is not possible.</source>
<translation type="unfinished">Простите, но удалить точки функции невозможно.</translation>
</message>
@@ -7534,7 +7534,7 @@
<translation type="obsolete">QtiPlot - Ошибка перемещения данных</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="368"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="375"/>
<source>Sorry, but moving points of a function is not possible.</source>
<translation type="unfinished">Простите, но переместить точки функции невозможно.</translation>
</message>
@@ -7543,24 +7543,24 @@
<translation type="obsolete">QtiPlot - Предупреждение</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="321"/>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="388"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="328"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="395"/>
<source>This operation cannot be performed on curves plotted from columns having a non-numerical format.</source>
<translation type="unfinished">Эта операция не может быть выполнена над кривыми построенными для колонок с нецифровым форматом данных.</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="304"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="311"/>
<source>Remove point error</source>
<translation type="unfinished">Ошибка удаления точки</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="320"/>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="387"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="327"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="394"/>
<source>Warning</source>
<translation type="unfinished">Предупреждение</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="367"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="374"/>
<source>Move point error</source>
<translation type="unfinished">Ошибка перемещения точки</translation>
</message>
Modified: branches/development/scidavis/translations/scidavis_sv.ts
===================================================================
--- branches/development/scidavis/translations/scidavis_sv.ts 2015-01-23 06:10:52 UTC (rev 1468)
+++ branches/development/scidavis/translations/scidavis_sv.ts 2015-01-24 04:05:45 UTC (rev 1469)
@@ -7169,28 +7169,28 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="304"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="311"/>
<source>Remove point error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="305"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="312"/>
<source>Sorry, but removing points of a function is not possible.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="320"/>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="387"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="327"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="394"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="367"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="374"/>
<source>Move point error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="368"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="375"/>
<source>Sorry, but moving points of a function is not possible.</source>
<translation type="unfinished"></translation>
</message>
@@ -7207,8 +7207,8 @@
<translation type="obsolete">QtiPlot - Varning</translation>
</message>
<message>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="321"/>
- <location filename="../../libscidavis/src/DataPickerTool.cpp" line="388"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="328"/>
+ <location filename="../../libscidavis/src/DataPickerTool.cpp" line="395"/>
<source>This operation cannot be performed on curves plotted from columns having a non-numerical format.</source>
<translation type="unfinished">Denna åtgärd kan ej utföras på kurvor ritade från kolumner med ett icke-numeriskt format.</translation>
</message>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hp...@us...> - 2015-01-24 05:48:33
|
Revision: 1470
http://sourceforge.net/p/scidavis/svn/1470
Author: hpcoder
Date: 2015-01-24 05:48:27 +0000 (Sat, 24 Jan 2015)
Log Message:
-----------
More fixes to translations installation.
Modified Paths:
--------------
branches/development/libscidavis/src/ApplicationWindow.cpp
branches/development/scidavis/basic.pri
branches/development/scidavis/scidavis.pro
branches/development/scidavis/translations/scidavis_cs-alt.ts
branches/development/scidavis/translations/scidavis_cs.ts
branches/development/scidavis/translations/scidavis_de.ts
branches/development/scidavis/translations/scidavis_es.ts
branches/development/scidavis/translations/scidavis_fr.ts
branches/development/scidavis/translations/scidavis_ja.ts
branches/development/scidavis/translations/scidavis_pt-br.ts
branches/development/scidavis/translations/scidavis_ru.ts
branches/development/scidavis/translations/scidavis_sv.ts
Modified: branches/development/libscidavis/src/ApplicationWindow.cpp
===================================================================
--- branches/development/libscidavis/src/ApplicationWindow.cpp 2015-01-24 04:05:45 UTC (rev 1469)
+++ branches/development/libscidavis/src/ApplicationWindow.cpp 2015-01-24 05:48:27 UTC (rev 1470)
@@ -11988,8 +11988,11 @@
if (appLanguage != "en")
{
- appTranslator->load("scidavis_" + appLanguage, qmPath);
- qtTranslator->load("qt_" + appLanguage, qmPath+"/qt");
+ // failover to exe directory if not found in system loc
+ if (!appTranslator->load("scidavis_" + appLanguage, qmPath))
+ appTranslator->load("scidavis_" + appLanguage);
+ if (!qtTranslator->load("qt_" + appLanguage, qmPath+"/qt"))
+ qtTranslator->load("qt_" + appLanguage);
}
}
@@ -12019,8 +12022,11 @@
else
{
QString qmPath = TS_PATH;
- appTranslator->load("scidavis_" + locale, qmPath);
- qtTranslator->load("qt_" + locale, qmPath+"/qt");
+ // failover to exe directory if not found in system loc
+ if (!appTranslator->load("scidavis_" + appLanguage, qmPath))
+ appTranslator->load("scidavis_" + appLanguage);
+ if (!qtTranslator->load("qt_" + appLanguage, qmPath+"/qt"))
+ qtTranslator->load("qt_" + appLanguage);
}
insertTranslatedStrings();
}
Modified: branches/development/scidavis/basic.pri
===================================================================
--- branches/development/scidavis/basic.pri 2015-01-24 04:05:45 UTC (rev 1469)
+++ branches/development/scidavis/basic.pri 2015-01-24 05:48:27 UTC (rev 1470)
@@ -51,7 +51,6 @@
translations/scidavis_cs.ts \
translations/scidavis_cs-alt.ts \
-contains( INSTALLS, translationfiles ){
exists(translations/scidavis_de.ts){
translationfiles.files = translations/scidavis_de.qm \
translations/scidavis_es.qm \
@@ -79,7 +78,6 @@
message("Could not find translation (.ts) files.")
message("=======================================")
}
-}
###################### DOCUMENTATION ########################################
Modified: branches/development/scidavis/scidavis.pro
===================================================================
--- branches/development/scidavis/scidavis.pro 2015-01-24 04:05:45 UTC (rev 1469)
+++ branches/development/scidavis/scidavis.pro 2015-01-24 05:48:27 UTC (rev 1470)
@@ -7,6 +7,18 @@
include( basic.pri )
python {include( python.pri )}
+### this is the program itself
+INSTALLS += target
+
+### README, INSTALL.html, manual (if present in the manual subfolder), etc.
+INSTALLS += documentation
+
+### translations
+INSTALLS += translationfiles
+
+### icon file (for Windows installer)
+win32:INSTALLS += win_icon
+
liborigin {
LIBS += ../3rdparty/liborigin/liborigin.a
POST_TARGETDEPS += ../3rdparty/liborigin/liborigin.a
Modified: branches/development/scidavis/translations/scidavis_cs-alt.ts
===================================================================
--- branches/development/scidavis/translations/scidavis_cs-alt.ts 2015-01-24 04:05:45 UTC (rev 1469)
+++ branches/development/scidavis/translations/scidavis_cs-alt.ts 2015-01-24 05:48:27 UTC (rev 1470)
@@ -4,9 +4,10 @@
<context>
<name>AbstractAspect</name>
<message>
+ <location filename="../../libscidavis/src/future/core/AbstractAspect.cpp" line="79"/>
<source>XML read error: </source>
<comment>prefix for XML error messages</comment>
- <translation type="obsolete">Chyba čtení XML dat:</translation>
+ <translation type="unfinished">Chyba čtení XML dat:</translation>
</message>
<message>
<source> (loading failed)</source>
@@ -18,75 +19,98 @@
<translation type="obsolete">Chybí název aspektu</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/future/core/AbstractAspect.cpp" line="80"/>
<source> (non-critical)</source>
<comment>postfix for XML error messages</comment>
- <translation type="obsolete"> (nekritický)</translation>
+ <translation type="unfinished"> (nekritický)</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/future/core/AbstractAspect.cpp" line="89"/>
<source>aspect name missing or empty</source>
- <translation type="obsolete">název aspektu chybí nebo je prázdný</translation>
+ <translation type="unfinished">název aspektu chybí nebo je prázdný</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/future/core/AbstractAspect.cpp" line="97"/>
<source>Invalid creation time for '%1'. Using current time.</source>
- <translation type="obsolete">Neplatný čas vytvoření '%1'. Bude použit aktuální čas.</translation>
+ <translation type="unfinished">Neplatný čas vytvoření '%1'. Bude použit aktuální čas.</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/future/core/AbstractAspect.cpp" line="118"/>
<source>%1: add %2.</source>
- <translation type="obsolete">%1: přidat %2.</translation>
+ <translation type="unfinished">%1: přidat %2.</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/future/core/AbstractAspect.cpp" line="120"/>
+ <location filename="../../libscidavis/src/future/core/AbstractAspect.cpp" line="134"/>
+ <location filename="../../libscidavis/src/future/core/AbstractAspect.cpp" line="165"/>
<source>Renaming "%1" to "%2" in order to avoid name collision.</source>
- <translation type="obsolete">Přejmenovávám"%1"na "%2", aby se předešlo kolizi názvů.</translation>
+ <translation type="unfinished">Přejmenovávám"%1"na "%2", aby se předešlo kolizi názvů.</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/future/core/AbstractAspect.cpp" line="132"/>
<source>%1: insert %2 at position %3.</source>
- <translation type="obsolete">%1: vložit %2 na pozici %3.</translation>
+ <translation type="unfinished">%1: vložit %2 na pozici %3.</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/future/core/AbstractAspect.cpp" line="145"/>
<source>%1: remove %2.</source>
- <translation type="obsolete">%1: odstranit %2.</translation>
+ <translation type="unfinished">%1: odstranit %2.</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/future/core/AbstractAspect.cpp" line="250"/>
+ <source>Tabs and line breaks in object names are currently not supported. They have been removed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../libscidavis/src/future/core/AbstractAspect.cpp" line="254"/>
<source>Intended name "%1" diverted to "%2" in order to avoid name collision.</source>
- <translation type="obsolete">Zamýšlený název "%1" bude změněn na "%2", aby se předešlo kolizi názvů.</translation>
+ <translation type="unfinished">Zamýšlený název "%1" bude změněn na "%2", aby se předešlo kolizi názvů.</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/future/core/AbstractAspect.cpp" line="354"/>
<source>%1: remove all children.</source>
- <translation type="obsolete">%1: odstranit všechny potomky.</translation>
+ <translation type="unfinished">%1: odstranit všechny potomky.</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/future/core/AbstractAspect.cpp" line="163"/>
<source>%1: move %2 to %3.</source>
- <translation type="obsolete">%1: přesunout %2 do %3.</translation>
+ <translation type="unfinished">%1: přesunout %2 do %3.</translation>
</message>
</context>
<context>
<name>AbstractPart</name>
<message>
+ <location filename="../../libscidavis/src/future/core/AbstractPart.cpp" line="51"/>
<source>&Restore</source>
- <translation type="obsolete">&Obnovit</translation>
+ <translation type="unfinished">&Obnovit</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/future/core/AbstractPart.cpp" line="56"/>
<source>Mi&nimize</source>
- <translation type="obsolete">Mi&nimalizovat</translation>
+ <translation type="unfinished">Mi&nimalizovat</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/future/core/AbstractPart.cpp" line="61"/>
<source>Ma&ximize</source>
- <translation type="obsolete">Ma&ximalizovat</translation>
+ <translation type="unfinished">Ma&ximalizovat</translation>
</message>
</context>
<context>
<name>AbstractSimpleFilter</name>
<message>
+ <location filename="../../libscidavis/src/future/core/AbstractSimpleFilter.cpp" line="145"/>
<source>incompatible filter type</source>
- <translation type="obsolete">nekompatibilní typ filtru</translation>
+ <translation type="unfinished">nekompatibilní typ filtru</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/future/core/AbstractSimpleFilter.cpp" line="164"/>
<source>unknown element '%1'</source>
- <translation type="obsolete">neznámý prvek: '%1'</translation>
+ <translation type="unfinished">neznámý prvek: '%1'</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/future/core/AbstractSimpleFilter.cpp" line="171"/>
<source>no simple filter element found</source>
- <translation type="obsolete">nenalezen žádný prvek typu Simple Filter</translation>
+ <translation type="unfinished">nenalezen žádný prvek typu Simple Filter</translation>
</message>
</context>
<context>
@@ -135,8 +159,8 @@
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="2491"/>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="2698"/>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="7180"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13059"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13103"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13065"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13109"/>
<source>Table</source>
<translation type="unfinished">Tabulka</translation>
</message>
@@ -240,8 +264,8 @@
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="2634"/>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="2635"/>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="9106"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13055"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13098"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13061"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13104"/>
<source>Matrix</source>
<translation type="unfinished">Matice</translation>
</message>
@@ -291,7 +315,7 @@
<message>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="4864"/>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="5476"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13433"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13439"/>
<source>&Yes</source>
<translation type="unfinished">&Ano</translation>
</message>
@@ -312,7 +336,7 @@
<translation type="unfinished">&Zrušit</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13433"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13439"/>
<source>&No</source>
<translation type="unfinished">&Ne</translation>
</message>
@@ -1202,7 +1226,7 @@
</message>
<message>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="1482"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13705"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13711"/>
<source>Please select a column to plot!</source>
<translation type="unfinished">Zvolte prosím sloupec k vykreslení do grafu!</translation>
</message>
@@ -1291,8 +1315,8 @@
</message>
<message>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="202"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12786"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13135"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12792"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13141"/>
<source>Folder</source>
<translation type="unfinished">Složka</translation>
</message>
@@ -1310,13 +1334,13 @@
<message>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="231"/>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="668"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12744"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12786"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13098"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13103"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13108"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13113"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13118"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12750"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12792"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13104"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13109"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13114"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13119"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13124"/>
<source>Type</source>
<translation type="unfinished">Typ</translation>
</message>
@@ -1327,24 +1351,24 @@
<translation type="unfinished">Pohled</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12750"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12756"/>
<source>Size</source>
<translation type="unfinished">Velikost</translation>
</message>
<message>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="233"/>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="670"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12763"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12767"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12791"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13121"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12769"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12773"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12797"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13127"/>
<source>Created</source>
<translation type="unfinished">Vytvořeno</translation>
</message>
<message>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="234"/>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="671"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13093"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13099"/>
<source>Label</source>
<translation type="unfinished">Popiska</translation>
</message>
@@ -1416,7 +1440,7 @@
<translation type="unfinished">Popis osy X</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13711"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13717"/>
<source>Please select a Y column to plot!</source>
<translation type="unfinished">Zvolte prosím sloupec Y pro vykreslení do grafu!</translation>
</message>
@@ -1454,7 +1478,7 @@
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="3449"/>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="4011"/>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11947"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12127"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12133"/>
<source>The file: <b>%1</b> doesn't exist!</source>
<translation type="unfinished">Soubor <b>%1</b> neexistuje!</translation>
</message>
@@ -1492,7 +1516,7 @@
</message>
<message>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="5159"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12620"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12626"/>
<source>Please enter a valid name!</source>
<translation type="unfinished">Zadejte prosím platný název!</translation>
</message>
@@ -1505,12 +1529,12 @@
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="5165"/>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="5173"/>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="5182"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12631"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12637"/>
<source>Please choose another name!</source>
<translation type="unfinished">Zvolte prosím jiný název!</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12631"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12637"/>
<source>Name already exists!</source>
<translation type="unfinished">Název již existuje!</translation>
</message>
@@ -1588,8 +1612,8 @@
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="7543"/>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="7545"/>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="7547"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12542"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13592"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12548"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13598"/>
<source>&Properties...</source>
<translation type="unfinished">&'Vlastnosti...</translation>
</message>
@@ -1600,13 +1624,13 @@
</message>
<message>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="7671"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12825"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12831"/>
<source>Yes</source>
<translation type="unfinished">Ano</translation>
</message>
<message>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="7671"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12825"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12831"/>
<source>No</source>
<translation type="unfinished">Ne</translation>
</message>
@@ -1619,13 +1643,13 @@
</message>
<message>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="7768"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12526"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12532"/>
<source>New &Window</source>
<translation type="unfinished">Nové &okno</translation>
</message>
<message>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="7770"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12529"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12535"/>
<source>New F&older</source>
<translation type="unfinished">Nová &složka</translation>
</message>
@@ -1635,9 +1659,9 @@
<translation type="unfinished">Automatická šířka &sloupce</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13633"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13651"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13639"/>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13657"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13663"/>
<source>D&epends on</source>
<translation type="unfinished">Zá&visí na</translation>
</message>
@@ -1769,7 +1793,7 @@
<translation type="unfinished">Minimalizovaný</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12561"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12567"/>
<source>Hidden</source>
<translation type="unfinished">Skrytý</translation>
</message>
@@ -1941,7 +1965,7 @@
<translation type="unfinished">&Svisle</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12533"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12539"/>
<source>&None</source>
<translation type="unfinished">&Žádné</translation>
</message>
@@ -2140,8 +2164,8 @@
<translation type="unfinished">Ctrl+-</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13063"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13108"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13069"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13114"/>
<source>Note</source>
<translation type="unfinished">Poznámka</translation>
</message>
@@ -2185,8 +2209,8 @@
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="7191"/>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11529"/>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11599"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13067"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13113"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13073"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13119"/>
<source>Graph</source>
<translation type="unfinished">Graf</translation>
</message>
@@ -2234,12 +2258,12 @@
<translation type="unfinished">&Detaily grafu...</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13605"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13611"/>
<source>D&epending Graphs</source>
<translation type="unfinished">Závislé& grafy</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13619"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13625"/>
<source>D&epending 3D Graphs</source>
<translation type="unfinished">Závislé& 3D-Grafy</translation>
</message>
@@ -2285,29 +2309,29 @@
<translation type="unfinished"><b> %1 </b>: Chybná lokalizacel (locale) nebo není dostupný překlad!</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12387"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12393"/>
<source>The file: <br><b>%1</b> is opened in read-only mode</source>
<translation type="unfinished">Soubor <br><b>%1</b> byl otevřen v režimu pouze pro čtení</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12495"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12501"/>
<source>&Find...</source>
<translation type="unfinished">&Hledat...</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12497"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12503"/>
<source>App&end Project...</source>
<translation type="unfinished">Připojit &projekt...</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12499"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12505"/>
<source>Save &As Project...</source>
<translation type="unfinished">Uložit jak &projekt...</translation>
</message>
<message>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10497"/>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11064"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12501"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12507"/>
<source>Save Project &As...</source>
<translation type="unfinished">Uložit projekt &jako...</translation>
</message>
@@ -2328,133 +2352,133 @@
<translation type="unfinished">Nečíselná data nemohou být importována do ne-textového sloupce "%1".</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12415"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12421"/>
<source>Error writing data to disk</source>
<translation type="unfinished">Chyba při zápisu dat na disk</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12416"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12422"/>
<source><html>%1<br><br>Your data may or may not have ended up in <em>%2</em> (%3). If there already was a version of this project on disk, it has not been touched.</html></source>
<translation type="unfinished"><html>%1<br><br>Vaše data mohla ale také nemusela skončit v<em>%2</em>.(%3) Pokud na disku již byla verze tohoto projektu, pak nebyla změněna.</html></translation>
</message>
<message>
- <location filename="../../libscidavis/...
[truncated message content] |
|
From: <hp...@us...> - 2015-02-07 02:52:32
|
Revision: 1473
http://sourceforge.net/p/scidavis/svn/1473
Author: hpcoder
Date: 2015-02-07 02:52:25 +0000 (Sat, 07 Feb 2015)
Log Message:
-----------
Returned missing icon resource items to the scidavis.pro file. For
ticket #259.
Modified Paths:
--------------
branches/development/config.pri
branches/development/scidavis/scidavis.pro
Modified: branches/development/config.pri
===================================================================
--- branches/development/config.pri 2015-01-24 16:51:22 UTC (rev 1472)
+++ branches/development/config.pri 2015-02-07 02:52:25 UTC (rev 1473)
@@ -243,11 +243,14 @@
} else {
INCLUDEPATH += /usr/include/qwt$${qwtsuff}
}
- LIBS += -lqwt$${qwtsuff} -lz -lGLU -lQtAssistantClient
- INCLUDEPATH += /usr/include/qwtplot3d$${qwtsuff}
+# INCLUDEPATH += /usr/include/qwtplot3d$${qwtsuff}
+ INCLUDEPATH += /tmp/qwtplot3d/include
+ LIBPATH = /tmp/qwtplot3d/lib $$(LIBPATH)
LIBS += -lqwtplot3d$${qwtsuff}
+ LIBS += -lqwt$${qwtsuff} -lz -lGLU -lQtAssistantClient
+
INCLUDEPATH += /usr/include/muParser
LIBS += -lgsl -lgslcblas
LIBS += -lmuparser
Modified: branches/development/scidavis/scidavis.pro
===================================================================
--- branches/development/scidavis/scidavis.pro 2015-01-24 16:51:22 UTC (rev 1472)
+++ branches/development/scidavis/scidavis.pro 2015-02-07 02:52:25 UTC (rev 1473)
@@ -19,6 +19,16 @@
### icon file (for Windows installer)
win32:INSTALLS += win_icon
+###################### ICONS ################################################
+RESOURCES += appicons.qrc
+RESOURCES += icons.qrc
+RC_FILE = scidavis.rc
+
+win32 {
+ win_icon.files = icons/scidavis.ico
+ win_icon.path = "$$INSTALLBASE"
+}
+
liborigin {
LIBS += ../3rdparty/liborigin/liborigin.a
POST_TARGETDEPS += ../3rdparty/liborigin/liborigin.a
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X