Menu
▾
▴
scidavis-svn-log — Commit logs from the subversion repository are sent to this list
You can subscribe to this list here.
| 2009 |
Jan
|
Feb
|
Mar
(11) |
Apr
(29) |
May
(10) |
Jun
(17) |
Jul
(34) |
Aug
(41) |
Sep
(25) |
Oct
(7) |
Nov
(5) |
Dec
(7) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2010 |
Jan
(1) |
Feb
(4) |
Mar
(18) |
Apr
(37) |
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
(20) |
Nov
(16) |
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(3) |
| 2014 |
Jan
(25) |
Feb
(16) |
Mar
(8) |
Apr
(5) |
May
(2) |
Jun
|
Jul
(14) |
Aug
(1) |
Sep
(7) |
Oct
(8) |
Nov
|
Dec
|
| 2015 |
Jan
(7) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
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.
|
|
From: <hp...@us...> - 2015-01-24 16:51:14
|
Revision: 1472
http://sourceforge.net/p/scidavis/svn/1472
Author: hpcoder
Date: 2015-01-24 16:51:22 +0000 (Sat, 24 Jan 2015)
Log Message:
-----------
Added sanity checks to ApplicationWindow::openGraph, for ticket #211
Modified Paths:
--------------
branches/development/libscidavis/src/ApplicationWindow.cpp
Modified: branches/development/libscidavis/src/ApplicationWindow.cpp
===================================================================
--- branches/development/libscidavis/src/ApplicationWindow.cpp 2015-01-24 05:50:35 UTC (rev 1471)
+++ branches/development/libscidavis/src/ApplicationWindow.cpp 2015-01-24 16:51:22 UTC (rev 1472)
@@ -9634,149 +9634,152 @@
}
else if (s.left(6)=="curve\t")
{
- bool curve_loaded = false; // Graph::insertCurve may fail
- QStringList curve = s.split("\t", QString::SkipEmptyParts);
- if (!app->renamedTables.isEmpty())
- {
- QString caption = (curve[2]).left((curve[2]).find("_",0));
+ bool curve_loaded = false; // Graph::insertCurve may fail
+ QStringList curve = s.split("\t", QString::SkipEmptyParts);
+ if (curve.count()>14)
+ {
+ if (!app->renamedTables.isEmpty())
+ {
+ QString caption = (curve[2]).left((curve[2]).find("_",0));
- if (app->renamedTables.contains(caption))
- {//modify the name of the curve according to the new table name
- int index = app->renamedTables.indexOf(caption);
- QString newCaption = app->renamedTables[++index];
- curve.replaceInStrings(caption+"_", newCaption+"_");
- }
- }
+ if (app->renamedTables.contains(caption))
+ {//modify the name of the curve according to the new table name
+ int index = app->renamedTables.indexOf(caption);
+ QString newCaption = app->renamedTables[++index];
+ curve.replaceInStrings(caption+"_", newCaption+"_");
+ }
+ }
- CurveLayout cl;
- cl.connectType=curve[4].toInt();
- cl.lCol=curve[5].toInt();
- if (d_file_version <= 89)
- cl.lCol = convertOldToNewColorIndex(cl.lCol);
- cl.lStyle=curve[6].toInt();
- cl.lWidth=curve[7].toInt();
- cl.sSize=curve[8].toInt();
- if (d_file_version <= 78)
- cl.sType=Graph::obsoleteSymbolStyle(curve[9].toInt());
- else
- cl.sType=curve[9].toInt();
+ CurveLayout cl;
+ cl.connectType=curve[4].toInt();
+ cl.lCol=curve[5].toInt();
+ if (d_file_version <= 89)
+ cl.lCol = convertOldToNewColorIndex(cl.lCol);
+ cl.lStyle=curve[6].toInt();
+ cl.lWidth=curve[7].toInt();
+ cl.sSize=curve[8].toInt();
+ if (d_file_version <= 78)
+ cl.sType=Graph::obsoleteSymbolStyle(curve[9].toInt());
+ else
+ cl.sType=curve[9].toInt();
- cl.symCol=curve[10].toInt();
- if (d_file_version <= 89)
- cl.symCol = convertOldToNewColorIndex(cl.symCol);
- cl.fillCol=curve[11].toInt();
- if (d_file_version <= 89)
- cl.fillCol = convertOldToNewColorIndex(cl.fillCol);
- cl.filledArea=curve[12].toInt();
- cl.aCol=curve[13].toInt();
- if (d_file_version <= 89)
- cl.aCol = convertOldToNewColorIndex(cl.aCol);
- cl.aStyle=curve[14].toInt();
- if(curve.count() < 16)
- cl.penWidth = cl.lWidth;
- else if ((d_file_version >= 79) && (curve[3].toInt() == Graph::Box))
- cl.penWidth = curve[15].toInt();
- else if ((d_file_version >= 78) && (curve[3].toInt() <= Graph::LineSymbols))
- cl.penWidth = curve[15].toInt();
- else
- cl.penWidth = cl.lWidth;
+ cl.symCol=curve[10].toInt();
+ if (d_file_version <= 89)
+ cl.symCol = convertOldToNewColorIndex(cl.symCol);
+ cl.fillCol=curve[11].toInt();
+ if (d_file_version <= 89)
+ cl.fillCol = convertOldToNewColorIndex(cl.fillCol);
+ cl.filledArea=curve[12].toInt();
+ cl.aCol=curve[13].toInt();
+ if (d_file_version <= 89)
+ cl.aCol = convertOldToNewColorIndex(cl.aCol);
+ cl.aStyle=curve[14].toInt();
+ if(curve.count() < 16)
+ cl.penWidth = cl.lWidth;
+ else if ((d_file_version >= 79) && (curve[3].toInt() == Graph::Box))
+ cl.penWidth = curve[15].toInt();
+ else if ((d_file_version >= 78) && (curve[3].toInt() <= Graph::LineSymbols))
+ cl.penWidth = curve[15].toInt();
+ else
+ cl.penWidth = cl.lWidth;
- Table *w = app->table(curve[2]);
- if (w)
- {
- int plotType = curve[3].toInt();
- if(plotType == Graph::VectXYXY || plotType == Graph::VectXYAM)
- {
- QStringList colsList;
- colsList<<curve[2]; colsList<<curve[20]; colsList<<curve[21];
- if (d_file_version < 72)
- colsList.prepend(w->colName(curve[1].toInt()));
- else
- colsList.prepend(curve[1]);
+ Table *w = app->table(curve[2]);
+ if (w)
+ {
+ int plotType = curve[3].toInt();
+ if(curve.count()>21 && (plotType == Graph::VectXYXY || plotType == Graph::VectXYAM))
+ {
+ QStringList colsList;
+ colsList<<curve[2]; colsList<<curve[20]; colsList<<curve[21];
+ if (d_file_version < 72)
+ colsList.prepend(w->colName(curve[1].toInt()));
+ else
+ colsList.prepend(curve[1]);
- int startRow = 0;
- int endRow = -1;
- if (d_file_version >= 90)
- {
- startRow = curve[curve.count()-3].toInt();
- endRow = curve[curve.count()-2].toInt();
- }
+ int startRow = 0;
+ int endRow = -1;
+ if (d_file_version >= 90)
+ {
+ startRow = curve[curve.count()-3].toInt();
+ endRow = curve[curve.count()-2].toInt();
+ }
- ag->plotVectorCurve(w, colsList, plotType, startRow, endRow);
- curve_loaded = true;
+ ag->plotVectorCurve(w, colsList, plotType, startRow, endRow);
+ curve_loaded = true;
- if (d_file_version <= 77)
- {
- int temp_index = convertOldToNewColorIndex(curve[15].toInt());
- ag->updateVectorsLayout(curveID, ColorBox::color(temp_index), curve[16].toInt(), curve[17].toInt(),
- curve[18].toInt(), curve[19].toInt(), 0, curve[20], curve[21]);
- }
- else
- {
- if(plotType == Graph::VectXYXY)
- ag->updateVectorsLayout(curveID, curve[15], curve[16].toInt(),
- curve[17].toInt(), curve[18].toInt(), curve[19].toInt(), 0);
- else
- ag->updateVectorsLayout(curveID, curve[15], curve[16].toInt(), curve[17].toInt(),
- curve[18].toInt(), curve[19].toInt(), curve[22].toInt());
- }
- }
- else if(plotType == Graph::Box) {
- ag->openBoxDiagram(w, curve, d_file_version);
- curve_loaded = true;
- } else if (plotType == Graph::Histogram) {
- if (d_file_version < 90)
- curve_loaded = ag->plotHistogram(w, QStringList() << curve[2]);
- else
- curve_loaded = ag->plotHistogram(w, QStringList() << curve[2],
- curve[curve.count()-3].toInt(), curve[curve.count()-2].toInt());
- if (curve_loaded) {
- QwtHistogram *h = (QwtHistogram *)ag->curve(curveID);
- if (d_file_version <= 76)
- h->setBinning(curve[16].toInt(),curve[17].toDouble(),curve[18].toDouble(),curve[19].toDouble());
- else
- h->setBinning(curve[17].toInt(),curve[18].toDouble(),curve[19].toDouble(),curve[20].toDouble());
- h->loadData();
- }
- } else {
- if (d_file_version < 72)
- curve_loaded = ag->insertCurve(w, curve[1].toInt(), curve[2], plotType);
- else if (d_file_version < 90)
- curve_loaded = ag->insertCurve(w, curve[1], curve[2], plotType);
- else
- {
- int startRow = curve[curve.count()-3].toInt();
- int endRow = curve[curve.count()-2].toInt();
- curve_loaded = ag->insertCurve(w, curve[1], curve[2], plotType, startRow, endRow);
- }
- }
+ if (d_file_version <= 77)
+ {
+ int temp_index = convertOldToNewColorIndex(curve[15].toInt());
+ ag->updateVectorsLayout(curveID, ColorBox::color(temp_index), curve[16].toInt(), curve[17].toInt(),
+ curve[18].toInt(), curve[19].toInt(), 0, curve[20], curve[21]);
+ }
+ else
+ {
+ if(plotType == Graph::VectXYXY)
+ ag->updateVectorsLayout(curveID, curve[15], curve[16].toInt(),
+ curve[17].toInt(), curve[18].toInt(), curve[19].toInt(), 0);
+ else if (curve.count()>22)
+ ag->updateVectorsLayout(curveID, curve[15], curve[16].toInt(), curve[17].toInt(),
+ curve[18].toInt(), curve[19].toInt(), curve[22].toInt());
+ }
+ }
+ else if(plotType == Graph::Box) {
+ ag->openBoxDiagram(w, curve, d_file_version);
+ curve_loaded = true;
+ } else if (plotType == Graph::Histogram && curve.count()>19) {
+ if (d_file_version < 90)
+ curve_loaded = ag->plotHistogram(w, QStringList() << curve[2]);
+ else
+ curve_loaded = ag->plotHistogram(w, QStringList() << curve[2],
+ curve[curve.count()-3].toInt(), curve[curve.count()-2].toInt());
+ if (curve_loaded) {
+ QwtHistogram *h = (QwtHistogram *)ag->curve(curveID);
+ if (d_file_version <= 76)
+ h->setBinning(curve[16].toInt(),curve[17].toDouble(),curve[18].toDouble(),curve[19].toDouble());
+ else if (curve.count()>20)
+ h->setBinning(curve[17].toInt(),curve[18].toDouble(),curve[19].toDouble(),curve[20].toDouble());
+ h->loadData();
+ }
+ } else {
+ if (d_file_version < 72)
+ curve_loaded = ag->insertCurve(w, curve[1].toInt(), curve[2], plotType);
+ else if (d_file_version < 90)
+ curve_loaded = ag->insertCurve(w, curve[1], curve[2], plotType);
+ else
+ {
+ int startRow = curve[curve.count()-3].toInt();
+ int endRow = curve[curve.count()-2].toInt();
+ curve_loaded = ag->insertCurve(w, curve[1], curve[2], plotType, startRow, endRow);
+ }
+ }
- if(curve_loaded && (plotType == Graph::VerticalBars || plotType == Graph::HorizontalBars ||
- plotType == Graph::Histogram))
- {
- if (d_file_version <= 76)
- ag->setBarsGap(curveID, curve[15].toInt(), 0);
- else
- ag->setBarsGap(curveID, curve[15].toInt(), curve[16].toInt());
- }
- if (curve_loaded)
- ag->updateCurveLayout(curveID, &cl);
- if (d_file_version >= 88)
- {
- QwtPlotCurve *c = ag->curve(curveID);
- if (c && c->rtti() == QwtPlotItem::Rtti_PlotCurve)
- {
- if (d_file_version < 90)
- c->setAxis(curve[curve.count()-2].toInt(), curve[curve.count()-1].toInt());
- else
- {
- c->setAxis(curve[curve.count()-5].toInt(), curve[curve.count()-4].toInt());
- c->setVisible(curve.last().toInt());
- }
- }
- }
- }
- if (curve_loaded) curveID++;
+ if(curve_loaded && (plotType == Graph::VerticalBars || plotType == Graph::HorizontalBars ||
+ plotType == Graph::Histogram))
+ {
+ if (d_file_version <= 76 && curve.count()>15)
+ ag->setBarsGap(curveID, curve[15].toInt(), 0);
+ else if (curve.count()>16)
+ ag->setBarsGap(curveID, curve[15].toInt(), curve[16].toInt());
+ }
+ if (curve_loaded)
+ ag->updateCurveLayout(curveID, &cl);
+ if (d_file_version >= 88)
+ {
+ QwtPlotCurve *c = ag->curve(curveID);
+ if (c && c->rtti() == QwtPlotItem::Rtti_PlotCurve)
+ {
+ if (d_file_version < 90)
+ c->setAxis(curve[curve.count()-2].toInt(), curve[curve.count()-1].toInt());
+ else
+ {
+ c->setAxis(curve[curve.count()-5].toInt(), curve[curve.count()-4].toInt());
+ c->setVisible(curve.last().toInt());
+ }
+ }
+ }
+ }
+ if (curve_loaded) curveID++;
+ }
}
else if (s.contains ("FunctionCurve"))
{
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:50:40
|
Revision: 1471
http://sourceforge.net/p/scidavis/svn/1471
Author: hpcoder
Date: 2015-01-24 05:50:35 +0000 (Sat, 24 Jan 2015)
Log Message:
-----------
Missed a change in the last commit
Modified Paths:
--------------
branches/development/config.pri
Modified: branches/development/config.pri
===================================================================
--- branches/development/config.pri 2015-01-24 05:48:27 UTC (rev 1470)
+++ branches/development/config.pri 2015-01-24 05:50:35 UTC (rev 1471)
@@ -58,18 +58,7 @@
### 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
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/src/ApplicationWindow.cpp" line="12434"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12440"/>
<source>Error renaming backup files</source>
<translation type="unfinished">Chyba při přejmenování zálohovacích dat</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12435"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12441"/>
<source><html>%1<br><br>Data was written to <em>%2</em>, but saving the original file as <em>%3</em> and moving the new file to <em>%4</em> failed. In case you wonder why the original file hasn't been simply replaced, see here: <a href="http://bugs.launchpad.net/ubuntu/+source/linux/+bug/317781/comments/54"> http://bugs.launchpad.net/ubuntu/+source/linux/+bug/317781/comments/54</a>.</html></source>
<translation type="unfinished"><html>%1<br><br>Data byla zapsána do souborui <em>%2</em>, ale uložení původního soubor jako <em>%3</em> a přesun nového souboru do <em>%4</em> selhalo. Pokud vás zajímá, proč nebyl původní soubor prostě nahrazen, informace najdete na:
<a href="http://bugs.launchpad.net/ubuntu/+source/linux/+bug/317781/comments/54">http://bugs.launchpad.net/ubuntu/+source/linux/+bug/317781/comments/54</a>.</html></translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12506"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12512"/>
<source>&Show All Windows</source>
<translation type="unfinished">Zobrazit &všechna okna</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12507"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12513"/>
<source>&Hide All Windows</source>
<translation type="unfinished">Skrýt &všechna okna</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12513"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12519"/>
<source>&Delete Folder</source>
<translation type="unfinished">&Smazat složku</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12514"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12520"/>
<source>&Rename</source>
<translation type="unfinished">&Přejmenovat</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12533"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12539"/>
<source>&Windows in Active Folder</source>
<translation type="unfinished">Okna v aktivní &složce</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12533"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12539"/>
<source>Windows in &Active Folder && Subfolders</source>
<translation type="unfinished">Okna v &aktivní složce && podsložkách</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12540"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12546"/>
<source>&View Windows</source>
<translation type="unfinished">Zobrazit &okna</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12744"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12750"/>
<source>Project</source>
<translation type="unfinished">Projekt</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12747"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12787"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13120"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12753"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12793"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13126"/>
<source>Path</source>
<translation type="unfinished">Cesta</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12750"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12756"/>
<source>bytes</source>
<translation type="unfinished">bajtů</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12754"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12788"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12760"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12794"/>
<source>Contents</source>
<translation type="unfinished">Obsah</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12764"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12770"/>
<source>Modified</source>
<translation type="unfinished">Změněn</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12769"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12794"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13087"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12775"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12800"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13093"/>
<source>Properties</source>
<translation type="unfinished">Vlastnosti</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12804"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12810"/>
<source>New Folder</source>
<translation type="unfinished">Nová složka</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12824"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12830"/>
<source>Delete folder '%1' and all the windows it contains?</source>
<translation type="unfinished">Smazat složku '%1' a všechny okna,která obsahuje?</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13122"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13128"/>
<source>Status</source>
<translation type="unfinished">Status</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13197"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13203"/>
<source>Sorry, no match found for string: '%1'</source>
<translation type="unfinished">Promiňte, pro řetězec: '%1' nenalezena žádná shoda</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13218"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13224"/>
<source>Cannot move an object to itself!</source>
<translation type="unfinished">Nemohu přesunout objekt sám do sebe!</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13224"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13230"/>
<source>Cannot move a parent folder into a child folder!</source>
<translation type="unfinished">Nemohu přesunout mateřskou složku do dceřinné!</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13239"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13245"/>
<source>The destination folder already contains a folder called '%1'! Folder skipped!</source>
<translation type="unfinished">Cílová složka už obsahuje složku nazvanou '%1'! Složka přeskočena!</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13347"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13353"/>
<source>Error while fetching version file with HTTP: %1.</source>
<translation type="unfinished">Chyba při zjišťování verze přesr HTTP: %1.</translation>
</message>
@@ -2705,7 +2729,7 @@
</message>
<message>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="3489"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12177"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12183"/>
<source>SciDAVis currently does not support Origin import. If you are interested in reviving and maintaining an Origin import filter, contact the developers.</source>
<translation type="unfinished"></translation>
</message>
@@ -3134,7 +3158,7 @@
<translation type="unfinished">Exportovat do PDF</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13432"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13438"/>
<source>This will clear the contents of all the data associated with the table. Are you sure?</source>
<translation type="unfinished">Tato operace smaže všechna data spojená s tabulkou. Jste si jistý?</translation>
</message>
@@ -3238,30 +3262,30 @@
<translation type="unfinished">Zadejte %1 pro zobrazení výpisu platných voleb.</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12458"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12464"/>
<source>Save project as</source>
<translation type="unfinished">Uložit projekt jako</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12754"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12788"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12760"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12794"/>
<source>windows</source>
<translation type="unfinished">okna</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12757"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12789"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12763"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12795"/>
<source>folders</source>
<translation type="unfinished">složky</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13071"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13118"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13077"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13124"/>
<source>3D Graph</source>
<translation type="unfinished">3D Graf</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13238"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13244"/>
<source>Skipped moving folder</source>
<translation type="unfinished">Přeskočen přesun složky</translation>
</message>
@@ -3289,7 +3313,7 @@
</message>
<message>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="1472"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13717"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13723"/>
<source>Please set a default X column for this table, first!</source>
<translation type="unfinished">Zvolte nejdřív prosím výchozí X-sloupec pro tuto tabulku!</translation>
</message>
@@ -3317,7 +3341,7 @@
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="6189"/>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="7671"/>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11883"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13238"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13244"/>
<source>SciDAVis</source>
<translation type="unfinished">SciDAVis</translation>
</message>
@@ -3353,13 +3377,13 @@
</message>
<message>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="5032"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12454"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12460"/>
<source>SciDAVis project</source>
<translation type="unfinished">SciDAVis Projekt</translation>
</message>
<message>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="5033"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12455"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12461"/>
<source>Compressed SciDAVis project</source>
<translation type="unfinished">Komprimovaný SciDAVis projekt</translation>
</message>
@@ -3511,38 +3535,38 @@
<translation type="unfinished">Nemáte oprávnění otevřít soubor: <b>%1</b></translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12134"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12140"/>
<source>The file: <b>%1</b> is not a SciDAVis or Origin project file!</source>
<translation type="unfinished">Soubor <b>%1</b> není ani SciDAVis ani Origin projekt!</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13331"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13337"/>
<source>Do you wish to continue?</source>
<translation type="unfinished">Chcete pokračovat?</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13375"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13381"/>
<source>No updates available. You are already running the latest version.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13677"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13714"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13683"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13720"/>
<source>You need at least two columns for this operation!</source>
<translation type="unfinished">Pro tuto operaci potřebujete alespoň dva sloupce!</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13682"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13688"/>
<source>Please select a Z column for this operation!</source>
<translation type="unfinished">Vyberte prosím Z-sloupec pro tuto operaci!</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13687"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13693"/>
<source>You need to define a X column first!</source>
<translation type="unfinished">Nejdřív musíte definovat X-sloupec!</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13692"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13698"/>
<source>You need to define a Y column first!</source>
<translation type="unfinished">Nejdřív musíte definovat Y-sloupec!</translation>
</message>
@@ -3601,16 +3625,16 @@
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11872"/>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11920"/>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11927"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12620"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12630"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13677"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13682"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13687"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13692"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13705"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12626"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12636"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13683"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13688"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13693"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13698"/>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13711"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13714"/>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13717"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13720"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13723"/>
<source>Error</source>
<translation type="unfinished">Chyba</translation>
</message>
@@ -3653,7 +3677,7 @@
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11778"/>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11810"/>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11823"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13431"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13437"/>
<source>Warning</source>
<translation type="unfinished">Varování</translation>
</message>
@@ -3710,9 +3734,9 @@
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11938"/>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11942"/>
<location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11946"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12126"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12133"/>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12177"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12132"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12139"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12183"/>
<source>File opening error</source>
<translation type="unfinished">Chyba při otevírání souboru</translation>
</message>
@@ -3841,27 +3865,27 @@
<translation type="unfinished">Zadat počet vrcholů (píků)</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12386"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12392"/>
<source>File save error</source>
<translation type="unfinished">Chyba ukládání dat</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12823"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12829"/>
<source>Delete folder?</source>
<translation type="unfinished">Smazat složku?</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13196"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13202"/>
<source>No match found</source>
<translation type="unfinished">Nenalezena žádná shoda</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13346"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13352"/>
<source>HTTP get version file</source>
<translation type="unfinished">HTTP získat soubor o verzi</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13367"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13373"/>
<source>Updates Available</source>
<translation type="unfinished">Jsou dostupné aktualizace</translation>
</message>
@@ -3877,12 +3901,12 @@
<translation type="unfinished">Vytvořit prázdnou poznámku-/okno skriptu</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13330"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13336"/>
<source>SciDAVis will now try to determine whether a new version of SciDAVis is available. Please modify your firewall settings in order to allow SciDAVis to connect to the internet.</source>
<translation type="unfinished">SciDAVis se nyní pokusí zjistit, zda není k dispozici novější verze. Nastavte prosím svůj firewall tak, aby měl SciDAVis povoleno připojit se k internetu.</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13368"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13374"/>
<source>There is a newer version of SciDAVis (%1) available for download. Would you like to download it now?</source>
<translation type="unfinished">K dispozici je nová verze SciDAVisu (%1). Chcete ji nyní stáhnout?</translation>
</message>
@@ -3891,12 +3915,12 @@
<translation type="obsolete">Žádné aktualizace k dispozici. Používáte zatím nejaktuálnější verzi.</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13378"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13384"/>
<source>Invalid version file</source>
<translation type="unfinished">Neplatný soubor verze</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13379"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13385"/>
<source>The version file (contents: "%1") could not be decoded into a valid version number.</source>
<translation type="unfinished">Soubor verze (obsaht: "%1") nemohl být dekódován do platné číslo verze.</translation>
</message>
@@ -3941,7 +3965,7 @@
<translation type="unfinished">může být jakýkoliv .sciprj, .sciprj.gz, .qti, qti.gz, .py nebo ASCII soubor</translation>
</message>
<message>
- <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13808"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13814"/>
<source>Undo/Redo History</source>
<translation type="unfinished">Historie Zpět/Znovu</translation>
</message>
@@ -3974,8 +3998,9 @@
<context>
<name>AsciiTableImportFilter</name>
<message>
+ <location filename="../../libscidavis/src/future/table/AsciiTableImportFilter.cpp" line="120"/>
<source>Table</source>
- <translation type="obsolete">Tabulka</translation>
+ <translation type="unfinished">Tabulka</translation>
</message>
</context>
<context>
@@ -7304,6 +7329,39 @@
</message>
</context>
<context>
+ <name>Folder</name>
+ <message>
+ <location filename="../../libscidavis/src/future/core/future_Folder.cpp" line="113"/>
+ <source>unknown element '%1'</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../libscidavis/src/future/core/future_Folder.cpp" line="120"/>
+ <source>no folder element found</source>
+ <translation type="unfinished">nenalezen žádný prvek složky</translation>
+ </message>
+ <message>
+ <location filename="../../libscidavis/src/future/core/future_Folder.cpp" line="135"/>
+ <source>Folder %1</source>
+ <translation type="unfinished">Složka %1</translation>
+ </message>
+ <message>
+ <location filename="../../libscidavis/src/future/core/future_Folder.cpp" line="146"/>
+ <source>Column %1</source>
+ <translation type="unfinished">Sloupec %1</translation>
+ </message>
+ <message>
+ <location filename="../../libscidavis/src/future/core/future_Folder.cpp" line="171"/>
+ <source>creation of aspect from element '%1' failed</source>
+ <translation type="unfinished">vytvoření aspektu z prvkut '%1' selhalo</translation>
+ </message>
+ <message>
+ <location filename="../../libscidavis/src/future/core/future_Folder.cpp" line="179"/>
+ <source>no plugin to load element '%1' found</source>
+ <translation type="unfinished">nenalezen plugin k načtení prvku '%1'</translation>
+ </message>
+</context>
+<context>
<name>FunctionCurve</name>
<message>
<location filename="../../libscidavis/src/FunctionCurve.cpp" line="152"/>
@@ -9147,6 +9205,7 @@
</message>
<message>
<location filename="../../libscidavis/src/Matrix.cpp" line="531"/>
+ <location filename="../../libscidavis/src/future/matrix/future_Matrix.cpp" line="1461"/>
<source>SciDAVis</source>
<translation type="unfinished">SciDAVis</translation>
</message>
@@ -9173,14 +9232,329 @@
</message>
<message>
<location filename="../../libscidavis/src/Matrix.cpp" line="725"/>
+ <location filename="../../libscidavis/src/future/matrix/future_Matrix.cpp" line="1464"/>
<source>Matrix %1</source>
<translation type="unfinished">Matice %1</translation>
</message>
<message>
<location filename="../../libscidavis/src/Matrix.cpp" line="731"/>
+ <location filename="../../libscidavis/src/future/matrix/future_Matrix.cpp" line="1425"/>
<source>%1: apply formula to selection</source>
<translation type="unfinished">%1: použít vzorec na výběr</translation>
</message>
+ <message>
+ <location filename="../../libscidavis/src/future/matrix/future_Matrix.cpp" line="208"/>
+ <source>%1: cut selected cell(s)</source>
+ <translation type="unfinished">%1: vyjmout vybrané buňky</translation>
+ </message>
+ <message>
+ <location filename="../../libscidavis/src/future/matrix/future_Matrix.cpp" line="255"/>
+ <source>%1: paste from clipboard</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../libscidavis/src/future/matrix/future_Matrix.cpp" line="443"/>
+ <source>%1: clear selected cell(s)</source>
+ <translation type="unfinished">%1: vyčistit vybrané buňky</translation>
+ </message>
+ <message>
+ <location filename="../../libscidavis/src/future/matrix/future_Matrix.cpp" line="536"/>
+ <source>Cu&t</source>
+ <translation type="unfinished">&Vyjmout</translation>
+ </message>
+ <message>
+ <location filename="../../libscidavis/src/future/matrix/future_Matrix.cpp" line="539"/>
+ <source>&Copy</source>
+ <translation type="unfinished">&Kopírovat</translation>
+ </message>
+ ...
[truncated message content] |
|
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-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-22 17:39:12
|
Revision: 1467
http://sourceforge.net/p/scidavis/svn/1467
Author: hpcoder
Date: 2015-01-22 17:39:05 +0000 (Thu, 22 Jan 2015)
Log Message:
-----------
Added guards around emitting events from the Keypress filter. For
ticket #196
Modified Paths:
--------------
branches/development/libscidavis/src/DataPickerTool.cpp
Modified: branches/development/libscidavis/src/DataPickerTool.cpp
===================================================================
--- branches/development/libscidavis/src/DataPickerTool.cpp 2015-01-21 06:39:51 UTC (rev 1466)
+++ branches/development/libscidavis/src/DataPickerTool.cpp 2015-01-22 17:39:05 UTC (rev 1467)
@@ -189,56 +189,63 @@
switch(ke->key()) {
case Qt::Key_Enter:
case Qt::Key_Return:
- emit selected(d_selected_curve, d_selected_point);
- return true;
+ if (d_selected_curve)
+ emit selected(d_selected_curve, d_selected_point);
+ return true;
case Qt::Key_Up:
- {
- int n_curves = d_graph->curves();
- int start = d_graph->curveIndex(d_selected_curve) + 1;
- QwtPlotCurve *c;
- for (int i = start; i < start + n_curves; ++i)
- if ((c=d_graph->curve(i % n_curves))->dataSize() > 0) {
- setSelection(c, qMin(c->dataSize()-1, d_selected_point));
- break;
- }
- d_graph->plotWidget()->replot();
- return true;
- }
+ if (d_graph && d_selected_curve)
+ {
+ int n_curves = d_graph->curves();
+ int start = d_graph->curveIndex(d_selected_curve) + 1;
+ QwtPlotCurve *c;
+ for (int i = start; i < start + n_curves; ++i)
+ if ((c=d_graph->curve(i % n_curves))->dataSize() > 0) {
+ setSelection(c, qMin(c->dataSize()-1, d_selected_point));
+ break;
+ }
+ d_graph->plotWidget()->replot();
+ }
+ return true;
case Qt::Key_Down:
- {
- int n_curves = d_graph->curves();
- int start = d_graph->curveIndex(d_selected_curve) + n_curves - 1;
- QwtPlotCurve *c;
- for (int i = start; i > start - n_curves; --i)
- if ((c=d_graph->curve(i % n_curves))->dataSize() > 0) {
- setSelection(c, qMin(c->dataSize()-1, d_selected_point));
- break;
+ if (d_graph && d_selected_curve)
+ {
+ int n_curves = d_graph->curves();
+ int start = d_graph->curveIndex(d_selected_curve) + n_curves - 1;
+ QwtPlotCurve *c;
+ for (int i = start; i > start - n_curves; --i)
+ if ((c=d_graph->curve(i % n_curves))->dataSize() > 0) {
+ setSelection(c, qMin(c->dataSize()-1, d_selected_point));
+ break;
}
- d_graph->plotWidget()->replot();
- return true;
- }
+ d_graph->plotWidget()->replot();
+ }
+ return true;
case Qt::Key_Right:
case Qt::Key_Plus:
- if (d_selected_curve) {
- int n_points = d_selected_curve->dataSize();
- setSelection(d_selected_curve, (d_selected_point + 1) % n_points);
- d_graph->plotWidget()->replot();
- } else
- setSelection(d_graph->curve(0), 0);
- return true;
+ if (d_graph)
+ if (d_selected_curve) {
+ int n_points = d_selected_curve->dataSize();
+ setSelection(d_selected_curve, (d_selected_point + 1) % n_points);
+ d_graph->plotWidget()->replot();
+ }
+ else
+ setSelection(d_graph->curve(0), 0);
+ return true;
case Qt::Key_Left:
case Qt::Key_Minus:
- if (d_selected_curve) {
- int n_points = d_selected_curve->dataSize();
- setSelection(d_selected_curve, (d_selected_point - 1 + n_points) % n_points);
- d_graph->plotWidget()->replot();
- } else
- setSelection(d_graph->curve(d_graph->curves()-1), 0);
- return true;
+ if (d_graph)
+ if (d_selected_curve) {
+ int n_points = d_selected_curve->dataSize();
+ setSelection(d_selected_curve, (d_selected_point - 1 + n_points) % n_points);
+ d_graph->plotWidget()->replot();
+ }
+ else
+ setSelection(d_graph->curve(d_graph->curves()-1), 0);
+ return true;
// The following keys represent a direction, they are
// organized on the keyboard.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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/ApplicationWindow.cpp" line="11453"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11454"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11455"/>
<source>Bars</source>
- <translation type="obsolete">Sloupce</translation>
+ <translation type="unfinished">Sloupce</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11456"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11457"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11458"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11459"/>
<source>Cones</source>
- <translation type="obsolete">Kužely</translation>
+ <translation type="unfinished">Kužely</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11468"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11469"/>
<source>Floor Data Projection</source>
<translatorcomment>otázka je, jek to přeložit - "podlaha" se mi zdálo divné</translatorcomment>
- <translation type="obsolete">Půdorysné zobrazení dat</translation>
+ <translation type="unfinished">Půdorysné zobrazení dat</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11472"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11473"/>
<source>Floor Isolines</source>
- <translation type="obsolete">Půdorysné izolinie</translation>
+ <translation type="unfinished">Půdorysné izolinie</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11476"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11477"/>
<source>Empty Floor</source>
- <translation type="obsolete">Prázdný půdorys</translation>
+ <translation type="unfinished">Prázdný půdorys</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="9132"/>
<source>&Guess</source>
- <translation type="obsolete">&Odhadnout</translation>
+ <translation type="unfinished">&Odhadnout</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="9132"/>
<source>&Top-left corner</source>
- <translation type="obsolete">&Horní levý roh</translation>
+ <translation type="unfinished">&Horní levý roh</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10453"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11022"/>
<source>New &Project</source>
- <translation type="obsolete">Nový &Projekt</translation>
+ <translation type="unfinished">Nový &Projekt</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10454"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11024"/>
<source>Ctrl+N</source>
- <translation type="obsolete">Ctrl+N</translation>
+ <translation type="unfinished">Ctrl+N</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10464"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11033"/>
<source>New &Table</source>
- <translation type="obsolete">Nová &Tabulka</translation>
+ <translation type="unfinished">Nová &Tabulka</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10465"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11034"/>
<source>Ctrl+T</source>
- <translation type="obsolete">Ctrl+T</translation>
+ <translation type="unfinished">Ctrl+T</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10468"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11037"/>
<source>New &Matrix</source>
- <translation type="obsolete">Nová &matice</translation>
+ <translation type="unfinished">Nová &matice</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11039"/>
<source>New matrix</source>
- <translation type="obsolete">Nová matice</translation>
+ <translation type="unfinished">Nová matice</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10472"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11041"/>
<source>New &Function Plot</source>
- <translation type="obsolete">Nový &graf funkce</translation>
+ <translation type="unfinished">Nový &graf funkce</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10473"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11043"/>
<source>Ctrl+F</source>
- <translation type="obsolete">Ctrl+F</translation>
+ <translation type="unfinished">Ctrl+F</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10513"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11078"/>
<source>Ctrl+Z</source>
- <translation type="obsolete">Ctrl+Z</translation>
+ <translation type="unfinished">Ctrl+Z</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10481"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11050"/>
<source>&Open</source>
- <translation type="obsolete">&Otevřít</translation>
+ <translation type="unfinished">&Otevřít</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10482"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11051"/>
<source>Ctrl+O</source>
- <translation type="obsolete">Ctrl+O</translation>
+ <translation type="unfinished">Ctrl+O</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11052"/>
<source>Open project</source>
- <translation type="obsolete">Otevřít projekt</translation>
+ <translation type="unfinished">Otevřít projekt</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10486"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11056"/>
<source>Ctrl+I</source>
- <translation type="obsolete">Ctrl+I</translation>
+ <translation type="unfinished">Ctrl+I</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10492"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11060"/>
<source>&Save Project</source>
- <translation type="obsolete">Uložit &projekt</translation>
+ <translation type="unfinished">Uložit &projekt</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10493"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11062"/>
<source>Ctrl+S</source>
- <translation type="obsolete">Ctrl+S</translation>
+ <translation type="unfinished">Ctrl+S</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10512"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11076"/>
<source>&Undo</source>
- <translation type="obsolete">&Zpět</translation>
+ <translation type="unfinished">&Zpět</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10517"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11080"/>
<source>&Redo</source>
- <translation type="obsolete">&Znovu</translation>
+ <translation type="unfinished">&Znovu</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10518"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11082"/>
<source>Ctrl+R</source>
- <translation type="obsolete">Ctrl+R</translation>
+ <translation type="unfinished">Ctrl+R</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10522"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11084"/>
<source>&Duplicate</source>
- <translation type="obsolete">&Duplikovat</translation>
+ <translation type="unfinished">&Duplikovat</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11085"/>
<source>Duplicate window</source>
- <translation type="obsolete">Duplikovat okno</translation>
+ <translation type="unfinished">Duplikovat okno</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10526"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11089"/>
<source>Ctrl+X</source>
- <translation type="obsolete">Ctrl+X</translation>
+ <translation type="unfinished">Ctrl+X</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10530"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11093"/>
<source>Ctrl+C</source>
- <translation type="obsolete">Ctrl+C</translation>
+ <translation type="unfinished">Ctrl+C</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10534"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11097"/>
<source>Ctrl+V</source>
- <translation type="obsolete">Ctrl+V</translation>
+ <translation type="unfinished">Ctrl+V</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10543"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11104"/>
<source>Ctrl+E</source>
- <translation type="obsolete">Ctrl+E</translation>
+ <translation type="unfinished">Ctrl+E</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11105"/>
<source>Show project explorer</source>
- <translation type="obsolete">Zobrazit průzkumníka projektu</translation>
+ <translation type="unfinished">Zobrazit průzkumníka projektu</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11107"/>
<source>Results &Log</source>
- <translation type="obsolete">Výpis-&výsledků</translation>
+ <translation type="unfinished">Výpis-&výsledků</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10555"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11115"/>
<source>Add La&yer</source>
- <translation type="obsolete">&Přidat vrstvu</translation>
+ <translation type="unfinished">&Přidat vrstvu</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10568"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11128"/>
<source>&Current</source>
- <translation type="obsolete">&Aktuální</translation>
+ <translation type="unfinished">&Aktuální</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10458"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11028"/>
<source>Ctrl+G</source>
- <translation type="obsolete">Ctrl+G</translation>
+ <translation type="unfinished">Ctrl+G</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11130"/>
<source>Export current graph</source>
- <translation type="obsolete">Exportovat aktuální graf</translation>
+ <translation type="unfinished">Exportovat aktuální graf</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10574"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11134"/>
<source>Alt+X</source>
- <translation type="obsolete">Alt+X</translation>
+ <translation type="unfinished">Alt+X</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11135"/>
<source>Export all graphs</source>
- <translation type="obsolete">Exportovat všechny grafy</translation>
+ <translation type="unfinished">Exportovat všechny grafy</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="7996"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="8112"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10583"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11143"/>
<source>&Print</source>
- <translation type="obsolete">&Tisknout</translation>
+ <translation type="unfinished">&Tisknout</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10584"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11144"/>
<source>Ctrl+P</source>
- <translation type="obsolete">Ctrl+P</translation>
+ <translation type="unfinished">Ctrl+P</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10591"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11150"/>
<source>E&xport ASCII</source>
- <translation type="obsolete">E&xportovat ASCII</translation>
+ <translation type="unfinished">E&xportovat ASCII</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10594"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11152"/>
<source>&Quit</source>
- <translation type="obsolete">&Konec</translation>
+ <translation type="unfinished">&Konec</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10595"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11153"/>
<source>Ctrl+Q</source>
- <translation type="obsolete">Ctrl+Q</translation>
+ <translation type="unfinished">Ctrl+Q</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10606"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11159"/>
<source>Ctrl+Alt+W</source>
- <translation type="obsolete">Ctrl+Alt+R</translation>
+ <translation type="unfinished">Ctrl+Alt+R</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10609"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11162"/>
<source>&Preferences...</source>
- <translation type="obsolete">&Nastavení...</translation>
+ <translation type="unfinished">&Nastavení...</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11166"/>
<source>Add curve to graph</source>
- <translation type="obsolete">Přidat do grafu křivku</translation>
+ <translation type="unfinished">Přidat do grafu křivku</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10617"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11170"/>
<source>Ctrl+B</source>
- <translation type="obsolete">Ctrl+B</translation>
+ <translation type="unfinished">Ctrl+B</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10621"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11174"/>
<source>Ctrl+Alt+F</source>
- <translation type="obsolete">Ctrl+Alt+F</translation>
+ <translation type="unfinished">Ctrl+Alt+F</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11178"/>
<source>Best fit</source>
- <translation type="obsolete">Nejlepší přizpůsobení</translation>
+ <translation type="unfinished">Nejlepší přizpůsobení</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10628"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11180"/>
<source>New &Legend</source>
- <translation type="obsolete">Nová &legenda</translation>
+ <translation type="unfinished">Nová &legenda</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10629"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11181"/>
<source>Ctrl+L</source>
- <translation type="obsolete">Ctrl+L</translation>
+ <translation type="unfinished">Ctrl+L</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11182"/>
<source>Add new legend</source>
- <translation type="obsolete">Přidat novou legendu</translation>
+ <translation type="unfinished">Přidat novou legendu</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10636"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11188"/>
<source>Add &Image</source>
- <translation type="obsolete">Přidat &obrázek</translation>
+ <translation type="unfinished">Přidat &obrázek</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="491"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11396"/>
<source>Add &Text</source>
- <translation type="obsolete">Přidat& text</translation>
+ <translation type="unfinished">Přidat& text</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10643"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11192"/>
<source>&Line</source>
- <translation type="obsolete">&Čára</translation>
+ <translation type="unfinished">&Čára</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10647"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10717"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11195"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11238"/>
<source>&Scatter</source>
- <translation type="obsolete">&Body</translation>
+ <translation type="unfinished">&Body</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10651"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11198"/>
<source>Line + S&ymbol</source>
- <translation type="obsolete">Čára + S&ymbol</translation>
+ <translation type="unfinished">Čára + S&ymbol</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10659"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11203"/>
<source>&Spline</source>
- <translation type="obsolete">&Spline</translation>
+ <translation type="unfinished">&Spline</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10667"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11204"/>
<source>&Vertical Steps</source>
- <translation type="obsolete">&Vertikální kroky</translation>
+ <translation type="unfinished">&Vertikální kroky</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11208"/>
<source>Plot with vertical bars</source>
- <translation type="obsolete">Graf se svislými sloupci</translation>
+ <translation type="unfinished">Graf se svislými sloupci</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11211"/>
<source>Plot with horizontal bars</source>
- <translation type="obsolete">Graf s vodorovnými sloupci</translation>
+ <translation type="unfinished">Graf s vodorovnými sloupci</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10679"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11213"/>
<source>&Area</source>
- <translation type="obsolete">&Plocha</translation>
+ <translation type="unfinished">&Plocha</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11214"/>
<source>Plot area</source>
- <translation type="obsolete">Plocha grafu</translation>
+ <translation type="unfinished">Plocha grafu</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10683"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11216"/>
<source>&Pie</source>
- <translation type="obsolete">&Koláčový graf</translation>
+ <translation type="unfinished">&Koláčový graf</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11217"/>
<source>Plot pie</source>
- <translation type="obsolete">Vytvořit koláčový graf</translation>
+ <translation type="unfinished">Vytvořit koláčový graf</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10692"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11225"/>
<source>&Histogram</source>
- <translation type="obsolete">&Histogram</translation>
+ <translation type="unfinished">&Histogram</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10696"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11226"/>
<source>&Stacked Histogram</source>
- <translation type="obsolete">&Skládaný histogram</translation>
+ <translation type="unfinished">&Skládaný histogram</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10699"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11227"/>
<source>&Vertical 2 Layers</source>
- <translation type="obsolete">2 &svislé vrstvy</translation>
+ <translation type="unfinished">2 &svislé vrstvy</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10702"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11228"/>
<source>&Horizontal 2 Layers</source>
- <translation type="obsolete">2 &vodorovné vrstvy</translation>
+ <translation type="unfinished">2 &vodorovné vrstvy</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10705"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11229"/>
<source>&4 Layers</source>
- <translation type="obsolete">&4 vrstvy</translation>
+ <translation type="unfinished">&4 vrstvy</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10708"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11230"/>
<source>&Stacked Layers</source>
- <translation type="obsolete">&Skládané vrstvy</translation>
+ <translation type="unfinished">&Skládané vrstvy</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10711"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11232"/>
<source>&Ribbon</source>
- <translation type="obsolete">&Stuha</translation>
+ <translation type="unfinished">&Stuha</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10714"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11235"/>
<source>&Bars</source>
- <translation type="obsolete">&Sloupce</translation>
+ <translation type="unfinished">&Sloupce</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10720"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11241"/>
<source>&Trajectory</source>
- <translation type="obsolete">&Trajektorie</translation>
+ <translation type="unfinished">&Trajektorie</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10469"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11038"/>
<source>Ctrl+M</source>
- <translation type="obsolete">Ctrl+M</translation>
+ <translation type="unfinished">Ctrl+M</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10829"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11304"/>
<source>Alt+R</source>
- <translation type="obsolete">Alt+R</translation>
+ <translation type="unfinished">Alt+R</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10723"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11253"/>
<source>Statistics on &Columns</source>
- <translation type="obsolete">&Statistika ve sloupcích</translation>
+ <translation type="unfinished">&Statistika ve sloupcích</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11254"/>
<source>Selected columns statistics</source>
- <translation type="obsolete">Statistika pro vybrané sloupce</translation>
+ <translation type="unfinished">Statistika pro vybrané sloupce</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="10726"/>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11256"/>
<source>Statistics on &Rows</source>
- <translation type="obsolete">&Statistika v řádcích</translation>
+ <translation type="unfinished">&Statistika v řádcích</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11257"/>
<source>Selected rows statistics</source>
- <translation type="obsolete">Statistika pro vybrané řádky</translation>
+ <translation type="unfinished">Statistika pro vybrané řádky</translation>
</message>
<message>
+ <location filename="../../libscidavis/src/ApplicationWindow.cpp" line...
[truncated message content] |
|
From: <dpo...@us...> - 2014-10-27 14:15:54
|
Revision: 1465
http://sourceforge.net/p/scidavis/svn/1465
Author: dpozitron
Date: 2014-10-27 14:15:51 +0000 (Mon, 27 Oct 2014)
Log Message:
-----------
Add generated *.qm-files to "make clean" rules
Modified Paths:
--------------
branches/development/scidavis/basic.pri
Modified: branches/development/scidavis/basic.pri
===================================================================
--- branches/development/scidavis/basic.pri 2014-10-27 10:58:37 UTC (rev 1464)
+++ branches/development/scidavis/basic.pri 2014-10-27 14:15:51 UTC (rev 1465)
@@ -70,6 +70,7 @@
tstarget.commands = (! test -w translations/scidavis_de.ts || $$LUPDATE_BIN scidavis.pro) && $$LRELEASE_BIN scidavis.pro
QMAKE_EXTRA_TARGETS += tstarget
+ QMAKE_CLEAN += $$translationfiles.files
PRE_TARGETDEPS += translations/scidavis_de.qm
}
!exists(translations/scidavis_de.ts){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dpo...@us...> - 2014-10-27 10:58:46
|
Revision: 1464
http://sourceforge.net/p/scidavis/svn/1464
Author: dpozitron
Date: 2014-10-27 10:58:37 +0000 (Mon, 27 Oct 2014)
Log Message:
-----------
Fix typo
Modified Paths:
--------------
branches/development/3rdparty/liborigin/liborigin.pro
Modified: branches/development/3rdparty/liborigin/liborigin.pro
===================================================================
--- branches/development/3rdparty/liborigin/liborigin.pro 2014-10-27 07:31:58 UTC (rev 1463)
+++ branches/development/3rdparty/liborigin/liborigin.pro 2014-10-27 10:58:37 UTC (rev 1464)
@@ -6,7 +6,7 @@
TARGET = origin
# following define required to prevent the catastrophic logging when
# large files are imported
-DEFINE += NO_CODE_GENERATION_FOR_LOG
+DEFINES += NO_CODE_GENERATION_FOR_LOG
HEADERS += \
config.h \
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:32:00
|
Revision: 1463
http://sourceforge.net/p/scidavis/svn/1463
Author: hpcoder
Date: 2014-10-27 07:31:58 +0000 (Mon, 27 Oct 2014)
Log Message:
-----------
Another missing file (that was generated by cmake)
Added Paths:
-----------
branches/development/3rdparty/liborigin/config.h
Added: branches/development/3rdparty/liborigin/config.h
===================================================================
--- branches/development/3rdparty/liborigin/config.h (rev 0)
+++ branches/development/3rdparty/liborigin/config.h 2014-10-27 07:31:58 UTC (rev 1463)
@@ -0,0 +1,40 @@
+/***************************************************************************
+ File : config.h.in
+ --------------------------------------------------------------------
+ Copyright : (C) 2010 Knut Franke
+ Email (use @ for *) : knut.franke*gmx.de
+ Description : compile-time configuration defines
+
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the Free Software *
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, *
+ * Boston, MA 02110-1301 USA *
+ * *
+ ***************************************************************************/
+
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#define LIBORIGIN_VERSION_MAJOR 2
+#define LIBORIGIN_VERSION_MINOR 0
+#define LIBORIGIN_VERSION_BUGFIX 0
+#define LIBORIGIN_VERSION ((LIBORIGIN_VERSION_MAJOR << 24) | \
+ (LIBORIGIN_VERSION_MINOR << 16) | \
+ (LIBORIGIN_VERSION_BUGFIX << 8) )
+#define LIBORIGIN_VERSION_STRING "2.0.0"
+
+#endif // ifndef CONFIG_H
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:29:42
|
Revision: 1462
http://sourceforge.net/p/scidavis/svn/1462
Author: hpcoder
Date: 2014-10-27 07:29:35 +0000 (Mon, 27 Oct 2014)
Log Message:
-----------
Missing file from last commit
Added Paths:
-----------
branches/development/libscidavis/libscidavis.pro
Added: branches/development/libscidavis/libscidavis.pro
===================================================================
--- branches/development/libscidavis/libscidavis.pro (rev 0)
+++ branches/development/libscidavis/libscidavis.pro 2014-10-27 07:29:35 UTC (rev 1462)
@@ -0,0 +1,36 @@
+TEMPLATE=lib
+CONFIG+=staticlib
+TARGET=scidavis
+
+include(../config.pri)
+
+liborigin {
+ INCLUDEPATH += ../3rdparty/liborigin
+}
+
+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," ","\\ ")\\\""
+!isEmpty( manual.path ) {
+DEFINES += MANUAL_PATH="\\\"$$replace(manual.path," ","\\ ")\\\""
+}
+!isEmpty(plugins.path): DEFINES += PLUGIN_PATH=\\\"$$replace(plugins.path," ","\\ ")\\\"
+
+!mxe {
+ win32:DEFINES += QT_DLL QT_THREAD_SUPPORT
+}
+QT += opengl qt3support network svg xml
+
+MOC_DIR = ../tmp/scidavis
+OBJECTS_DIR = ../tmp/scidavis
+DESTDIR = ./
+
+include( sourcefiles.pri )
+include( muparser.pri )
+python {include( python.pri )}
+
+#############################################################################
+#############################################################################
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 terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 2 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program; if not, write to the Free Software #
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, #
+# Boston, MA 02110-1301 USA #
+# #
+############################################################################
+
+from PyQt4 import pyqtconfig
+config = pyqtconfig.Configuration()
+flags = ["-I ../scidavis"]
+if config.sip_version >= 0x040a00:
+ # make use of docstring generation feature in SIP >= 4.10
+ flags.append("-o")
+print " ".join([config.sip_bin, "-I", config.pyqt_sip_dir, config.pyqt_sip_flags] + flags)
Copied: branches/development/libscidavis/python.pri (from rev 1451, branches/development/scidavis/python.pri)
===================================================================
--- branches/development/libscidavis/python.pri (rev 0)
+++ branches/development/libscidavis/python.pri 2014-10-27 07:17:48 UTC (rev 1461)
@@ -0,0 +1,99 @@
+##################### PYTHON + SIP + PyQT #####################
+
+ INSTALLS += pythonconfig
+ pythonconfig.files += scidavisrc.py
+ DEFINES += PYTHON_CONFIG_PATH="\\\"$$replace(pythonconfig.path," ","\\ ")\\\""
+
+ INSTALLS += pythonutils
+ pythonutils.files += scidavisUtil.py
+
+ 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
+
+ unix {
+ INCLUDEPATH += $$system(python ../python-includepath.py)
+ osx_dist {
+ DEFINES += PYTHONHOME=/Applications/scidavis.app/Contents/Resources
+ }
+ system(mkdir -p $${SIP_DIR})
+ system($$system(python python-sipcmd.py) -c $${SIP_DIR} src/scidavis.sip)
+ }
+
+ win32 {
+ mxe {
+ DEFINES += SIP_STATIC_MODULE
+ system($$system(python python-sipcmd.py) -c $${SIP_DIR} src/scidavis.sip)
+ } else {
+ INCLUDEPATH += $$system(call ../python-includepath.py)
+ # TODO: fix the command below (only really necessary if SIP_DIR != MOC/OBJECTS_DIR)
+ system($$system(call python-sipcmd.py) -c $${SIP_DIR} src/scidavis.sip)
+ }
+}
+
+
+##################### SIP generated files #####################
+
+ HEADERS += $${SIP_DIR}/sipAPIscidavis.h
+
+ SOURCES += $${SIP_DIR}/sipscidaviscmodule.cpp\
+ $${SIP_DIR}/sipscidavisApplicationWindow.cpp\
+ $${SIP_DIR}/sipscidavisGraph.cpp\
+ $${SIP_DIR}/sipscidavisArrowMarker.cpp\
+ $${SIP_DIR}/sipscidavisImageMarker.cpp\
+ $${SIP_DIR}/sipscidavisLegend.cpp\
+ $${SIP_DIR}/sipscidavisMultiLayer.cpp\
+ $${SIP_DIR}/sipscidavisTable.cpp\
+ $${SIP_DIR}/sipscidavisMatrix.cpp\
+ $${SIP_DIR}/sipscidavisMyWidget.cpp\
+ $${SIP_DIR}/sipscidavisScriptEdit.cpp\
+ $${SIP_DIR}/sipscidavisNote.cpp\
+ $${SIP_DIR}/sipscidavisPythonScript.cpp\
+ $${SIP_DIR}/sipscidavisPythonScripting.cpp\
+ $${SIP_DIR}/sipscidavisFolder.cpp\
+ $${SIP_DIR}/sipscidavisFit.cpp \
+ $${SIP_DIR}/sipscidavisExponentialFit.cpp \
+ $${SIP_DIR}/sipscidavisTwoExpFit.cpp \
+ $${SIP_DIR}/sipscidavisThreeExpFit.cpp \
+ $${SIP_DIR}/sipscidavisSigmoidalFit.cpp \
+ $${SIP_DIR}/sipscidavisGaussAmpFit.cpp \
+ $${SIP_DIR}/sipscidavisLorentzFit.cpp \
+ $${SIP_DIR}/sipscidavisNonLinearFit.cpp \
+ $${SIP_DIR}/sipscidavisPluginFit.cpp \
+ $${SIP_DIR}/sipscidavisMultiPeakFit.cpp \
+ $${SIP_DIR}/sipscidavisPolynomialFit.cpp \
+ $${SIP_DIR}/sipscidavisLinearFit.cpp \
+ $${SIP_DIR}/sipscidavisGaussFit.cpp \
+ $${SIP_DIR}/sipscidavisFilter.cpp \
+ $${SIP_DIR}/sipscidavisDifferentiation.cpp \
+ $${SIP_DIR}/sipscidavisIntegration.cpp \
+ $${SIP_DIR}/sipscidavisInterpolation.cpp \
+ $${SIP_DIR}/sipscidavisSmoothFilter.cpp \
+ $${SIP_DIR}/sipscidavisFFTFilter.cpp \
+ $${SIP_DIR}/sipscidavisFFT.cpp \
+ $${SIP_DIR}/sipscidavisCorrelation.cpp \
+ $${SIP_DIR}/sipscidavisConvolution.cpp \
+ $${SIP_DIR}/sipscidavisDeconvolution.cpp \
+ $${SIP_DIR}/sipscidavisAbstractAspect.cpp \
+ $${SIP_DIR}/sipscidavisColumn.cpp \
+ $${SIP_DIR}/sipscidavisQwtSymbol.cpp \
+ $${SIP_DIR}/sipscidavisQwtPlotCurve.cpp \
+ $${SIP_DIR}/sipscidavisQwtPlot.cpp \
+ $${SIP_DIR}/sipscidavisGrid.cpp \
+
+exists($${SIP_DIR}/sipscidavisQList.cpp) {
+# SIP < 4.9
+ SOURCES += $${SIP_DIR}/sipscidavisQList.cpp
+} else {
+ SOURCES += \
+ $${SIP_DIR}/sipscidavisQList0100QDateTime.cpp\
+ $${SIP_DIR}/sipscidavisQList0101Folder.cpp\
+ $${SIP_DIR}/sipscidavisQList0101MyWidget.cpp\
+ $${SIP_DIR}/sipscidavisQList0101QwtPlotCurve.cpp\
+}
+
+###############################################################
Copied: branches/development/libscidavis/sourcefiles.pri (from rev 1451, branches/development/scidavis/sourcefiles.pri)
===================================================================
--- branches/development/libscidavis/sourcefiles.pri (rev 0)
+++ branches/development/libscidavis/sourcefiles.pri 2014-10-27 07:17:48 UTC (rev 1461)
@@ -0,0 +1,331 @@
+#############################################################################
+###################### PROJECT FILES SECTION ################################
+#############################################################################
+
+
+###################### HEADERS ##############################################
+
+HEADERS += src/ApplicationWindow.h \
+ src/globals.h\
+ src/Graph.h \
+ src/Graph3D.h \
+ src/Table.h \
+ src/CurvesDialog.h \
+ src/PlotDialog.h \
+ src/Plot3DDialog.h \
+ src/PlotWizard.h \
+ src/ExportDialog.h \
+ src/AxesDialog.h \
+ src/PolynomFitDialog.h \
+ src/ExpDecayDialog.h \
+ src/FunctionDialog.h \
+ src/FitDialog.h \
+ src/SurfaceDialog.h \
+ src/TextDialog.h \
+ src/LineDialog.h \
+ src/ScalePicker.h \
+ src/TitlePicker.h \
+ src/CanvasPicker.h \
+ src/PlotCurve.h \
+ src/QwtErrorPlotCurve.h \
+ src/QwtPieCurve.h \
+ src/ErrDialog.h \
+ src/Legend.h \
+ src/ArrowMarker.h \
+ src/ImageMarker.h \
+ src/ImageDialog.h \
+ src/fit_gsl.h \
+ src/MultiLayer.h\
+ src/LayerDialog.h \
+ src/IntDialog.h \
+ src/Bar.h \
+ src/Cone3D.h \
+ src/ConfigDialog.h \
+ src/QwtBarCurve.h \
+ src/BoxCurve.h \
+ src/QwtHistogram.h \
+ src/VectorCurve.h \
+ src/ScaleDraw.h \
+ src/Matrix.h \
+ src/DataSetDialog.h \
+ src/MyParser.h \
+ src/ColorBox.h \
+ src/SymbolBox.h \
+ src/PatternBox.h \
+ src/SymbolDialog.h \
+ src/Plot.h \
+ src/ColorButton.h \
+ src/AssociationsDialog.h \
+ src/RenameWindowDialog.h \
+ src/MyWidget.h \
+ src/InterpolationDialog.h\
+ src/ImportASCIIDialog.h \
+ src/ImageExportDialog.h\
+ src/SmoothCurveDialog.h\
+ src/FilterDialog.h\
+ src/FFTDialog.h\
+ src/Note.h\
+ src/Folder.h\
+ src/FindDialog.h\
+ src/ScriptingEnv.h\
+ src/Script.h\
+ src/ScriptEdit.h\
+ src/FunctionCurve.h\
+ src/Fit.h\
+ src/MultiPeakFit.h\
+ src/ExponentialFit.h\
+ src/PolynomialFit.h\
+ src/NonLinearFit.h\
+ src/PluginFit.h\
+ src/SigmoidalFit.h\
+ src/customevents.h\
+ src/ScriptingLangDialog.h\
+ src/TextFormatButtons.h\
+ src/TableStatistics.h\
+ src/Spectrogram.h\
+ src/ColorMapEditor.h\
+ src/SelectionMoveResizer.h\
+ src/Filter.h\
+ src/Differentiation.h\
+ src/Integration.h\
+ src/Interpolation.h\
+ src/SmoothFilter.h\
+ src/FFTFilter.h\
+ src/FFT.h\
+ src/Convolution.h\
+ src/Correlation.h\
+ src/PlotToolInterface.h\
+ src/ScreenPickerTool.h\
+ src/DataPickerTool.h\
+ src/RangeSelectorTool.h\
+ src/TranslateCurveTool.h\
+ src/MultiPeakFitTool.h\
+ src/CurveRangeDialog.h\
+ src/LineProfileTool.h\
+ src/PlotEnrichement.h\
+ src/ExtensibleFileDialog.h\
+ src/OpenProjectDialog.h\
+ src/Grid.h\
+ src/DataPointPicker.h \
+ src/TeXTableSettings.h \
+ src/TeXTableSettingsWidget.h \
+ src/TeXTableExportDialog.h \
+
+
+###################### SOURCES ##############################################
+
+SOURCES += src/ApplicationWindow.cpp \
+ src/Graph.cpp \
+ src/Graph3D.cpp \
+ src/Table.cpp \
+ src/CurvesDialog.cpp \
+ src/PlotDialog.cpp \
+ src/Plot3DDialog.cpp \
+ src/PlotWizard.cpp \
+ src/ExportDialog.cpp \
+ src/AxesDialog.cpp \
+ src/PolynomFitDialog.cpp \
+ src/TextDialog.cpp \
+ src/ScalePicker.cpp\
+ src/TitlePicker.cpp \
+ src/CanvasPicker.cpp \
+ src/ExpDecayDialog.cpp \
+ src/FunctionDialog.cpp \
+ src/FitDialog.cpp \
+ src/SurfaceDialog.cpp \
+ src/LineDialog.cpp \
+ src/PlotCurve.cpp \
+ src/QwtErrorPlotCurve.cpp \
+ src/QwtPieCurve.cpp \
+ src/ErrDialog.cpp \
+ src/Legend.cpp \
+ src/ArrowMarker.cpp \
+ src/ImageMarker.cpp \
+ src/ImageDialog.cpp \
+ src/MultiLayer.cpp\
+ src/LayerDialog.cpp \
+ src/IntDialog.cpp \
+ src/Bar.cpp \
+ src/Cone3D.cpp \
+ src/DataSetDialog.cpp \
+ src/ConfigDialog.cpp \
+ src/QwtBarCurve.cpp \
+ src/BoxCurve.cpp \
+ src/QwtHistogram.cpp \
+ src/VectorCurve.cpp \
+ src/Matrix.cpp \
+ src/MyParser.cpp\
+ src/ColorBox.cpp \
+ src/SymbolBox.cpp \
+ src/PatternBox.cpp \
+ src/SymbolDialog.cpp \
+ src/Plot.cpp \
+ src/ColorButton.cpp \
+ src/AssociationsDialog.cpp \
+ src/RenameWindowDialog.cpp \
+ src/MyWidget.cpp\
+ src/InterpolationDialog.cpp\
+ src/fit_gsl.cpp\
+ src/SmoothCurveDialog.cpp\
+ src/FilterDialog.cpp\
+ src/FFTDialog.cpp\
+ src/Note.cpp\
+ src/Folder.cpp\
+ src/FindDialog.cpp\
+ src/TextFormatButtons.cpp\
+ src/ScriptEdit.cpp\
+ src/ImportASCIIDialog.cpp\
+ src/ImageExportDialog.cpp\
+ src/ScaleDraw.cpp\
+ src/FunctionCurve.cpp\
+ src/Fit.cpp\
+ src/MultiPeakFit.cpp\
+ src/ExponentialFit.cpp\
+ src/PolynomialFit.cpp\
+ src/PluginFit.cpp\
+ src/NonLinearFit.cpp\
+ src/SigmoidalFit.cpp\
+ src/ScriptingEnv.cpp\
+ src/Script.cpp\
+ src/ScriptingLangDialog.cpp\
+ src/TableStatistics.cpp\
+ src/Spectrogram.cpp\
+ src/ColorMapEditor.cpp\
+ src/SelectionMoveResizer.cpp\
+ src/Filter.cpp\
+ src/Differentiation.cpp\
+ src/Integration.cpp\
+ src/Interpolation.cpp\
+ src/SmoothFilter.cpp\
+ src/FFTFilter.cpp\
+ src/FFT.cpp\
+ src/Convolution.cpp\
+ src/Correlation.cpp\
+ src/ScreenPickerTool.cpp\
+ src/DataPickerTool.cpp\
+ src/RangeSelectorTool.cpp\
+ src/TranslateCurveTool.cpp\
+ src/MultiPeakFitTool.cpp\
+ src/CurveRangeDialog.cpp\
+ src/LineProfileTool.cpp\
+ src/PlotEnrichement.cpp\
+ src/ExtensibleFileDialog.cpp\
+ src/OpenProjectDialog.cpp\
+ src/Grid.cpp\
+ src/globals.cpp \
+ src/DataPointPicker.cpp \
+ src/TeXTableSettings.cpp \
+ src/TeXTableSettingsWidget.cpp \
+ src/TeXTableExportDialog.cpp \
+ src/version.cpp \
+
+###################### FORMS ##############################################
+FORMS += src/SciDAVisAbout.ui
+
+########### Future code backported from the aspect framework ##################
+DEFINES += LEGACY_CODE_0_2_x
+INCLUDEPATH += src
+INCLUDEPATH += src/future
+
+FORMS += src/future/matrix/matrixcontroltabs.ui \
+ src/future/core/ProjectConfigPage.ui \
+ src/future/table/controltabs.ui \
+ src/future/table/DimensionsDialog.ui
+
+HEADERS += src/future/core/AbstractAspect.h \
+ src/future/core/AbstractPart.h \
+ src/future/core/AspectPrivate.h \
+ src/future/core/aspectcommands.h \
+ src/future/core/future_Folder.h \
+ src/future/core/Project.h \
+ src/future/core/ProjectConfigPage.h \
+ src/future/core/PartMdiView.h \
+ src/future/core/AbstractColumn.h \
+ src/future/core/column/Column.h \
+ src/future/core/column/ColumnPrivate.h \
+ src/future/core/column/columncommands.h \
+ src/future/core/AbstractFilter.h \
+ src/future/core/AbstractSimpleFilter.h \
+ src/future/core/datatypes/SimpleCopyThroughFilter.h \
+ src/future/core/datatypes/DateTime2DoubleFilter.h \
+ src/future/core/datatypes/DateTime2StringFilter.h \
+ src/future/core/datatypes/DayOfWeek2DoubleFilter.h \
+ src/future/core/datatypes/Double2DateTimeFilter.h \
+ src/future/core/datatypes/Double2DayOfWeekFilter.h \
+ src/future/core/datatypes/Double2MonthFilter.h \
+ src/future/core/datatypes/Double2StringFilter.h \
+ src/future/core/datatypes/Month2DoubleFilter.h \
+ src/future/core/datatypes/String2DateTimeFilter.h \
+ src/future/core/datatypes/String2DayOfWeekFilter.h \
+ src/future/core/datatypes/String2DoubleFilter.h \
+ src/future/core/datatypes/String2MonthFilter.h \
+ src/future/lib/macros.h \
+ src/future/lib/XmlStreamReader.h \
+ src/future/lib/ActionManager.h \
+ src/future/lib/ConfigPageWidget.h \
+ src/future/lib/Interval.h \
+ src/future/lib/IntervalAttribute.h \
+ src/future/matrix/future_Matrix.h \
+ src/future/matrix/MatrixModel.h \
+ src/future/matrix/MatrixView.h \
+ src/future/matrix/matrixcommands.h \
+ src/future/table/future_Table.h \
+ src/future/table/TableModel.h \
+ src/future/table/TableView.h \
+ src/future/table/tablecommands.h \
+ src/future/table/TableDoubleHeaderView.h \
+ src/future/table/TableItemDelegate.h \
+ src/future/table/TableCommentsHeaderModel.h \
+ src/future/table/future_SortDialog.h \
+ src/future/table/AsciiTableImportFilter.h \
+ src/future/core/AbstractImportFilter.h \
+ src/future/core/interfaces.h \
+
+SOURCES += src/future/core/AbstractAspect.cpp \
+ src/future/core/AbstractPart.cpp \
+ src/future/core/AspectPrivate.cpp \
+ src/future/core/future_Folder.cpp \
+ src/future/core/PartMdiView.cpp \
+ src/future/core/Project.cpp \
+ src/future/core/column/Column.cpp \
+ src/future/core/column/ColumnPrivate.cpp \
+ src/future/core/column/columncommands.cpp \
+ src/future/core/datatypes/DateTime2StringFilter.cpp \
+ src/future/core/datatypes/String2DateTimeFilter.cpp \
+ src/future/core/datatypes/Double2StringFilter.cpp \
+ src/future/core/datatypes/Double2DateTimeFilter.cpp \
+ src/future/core/AbstractSimpleFilter.cpp \
+ src/future/core/AbstractFilter.cpp \
+ src/future/core/ProjectConfigPage.cpp \
+ src/future/lib/XmlStreamReader.cpp \
+ src/future/lib/ActionManager.cpp \
+ src/future/lib/ConfigPageWidget.cpp \
+ src/future/matrix/future_Matrix.cpp \
+ src/future/matrix/MatrixModel.cpp \
+ src/future/matrix/MatrixView.cpp \
+ src/future/matrix/matrixcommands.cpp \
+ src/future/table/future_Table.cpp \
+ src/future/table/TableModel.cpp \
+ src/future/table/TableView.cpp \
+ src/future/table/tablecommands.cpp \
+ src/future/table/TableDoubleHeaderView.cpp \
+ src/future/table/TableItemDelegate.cpp \
+ src/future/table/TableCommentsHeaderModel.cpp \
+ src/future/table/future_SortDialog.cpp \
+ src/future/table/AsciiTableImportFilter.cpp \
+
+###############################################################
+##################### Compression #############################
+############### (mini gzip implementation) ####################
+################# requires zlib >= 1.2.3 ######################
+###############################################################
+
+SOURCES += ../3rdparty/minigzip/minigzip.c
+
+###############################################################
+#### Origin OPJ import via liborigin2
+###############################################################
+liborigin {
+ HEADERS += src/importOPJ.h
+ SOURCES += src/importOPJ.cpp
+}
Copied: branches/development/libscidavis/src/ApplicationWindow.cpp (from rev 1451, branches/development/scidavis/src/ApplicationWindow.cpp)
===================================================================
--- branches/development/libscidavis/src/ApplicationWindow.cpp (rev 0)
+++ branches/development/libscidavis/src/ApplicationWindow.cpp 2014-10-27 07:17:48 UTC (rev 1461)
@@ -0,0 +1,13852 @@
+/***************************************************************************
+ File : ApplicationWindow.cpp
+ Project : SciDAVis
+ Description : SciDAVis's main window
+ --------------------------------------------------------------------
+ Copyright : (C) 2006-2009 Knut Franke (knut.franke*gmx.de)
+ Copyright : (C) 2006-2009 Tilman Benkert (thzs*gmx.net)
+ Copyright : (C) 2004-2007 by Ion Vasilief (ion_vasilief*yahoo.fr)
+ (replace * with @ in the email address)
+
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the Free Software *
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, *
+ * Boston, MA 02110-1301 USA *
+ * *
+ ***************************************************************************/
+
+#define HOMEPAGE_URI "http://scidavis.sourceforge.net"
+#define MANUAL_URI "http://sourceforge.net/projects/scidavis/files/SciDAVis%20Documentation/0.1/"
+#define FORUM_URI "http://sourceforge.net/forum/?group_id=199120"
+#define BUGREPORT_URI "http://sourceforge.net/tracker/?group_id=199120&atid=968214"
+#define DOWNLOAD_URI "http://sourceforge.net/projects/scidavis/files/SciDAVis/"
+
+#include "globals.h"
+#include "ApplicationWindow.h"
+#include "CurvesDialog.h"
+#include "PlotDialog.h"
+#include "AxesDialog.h"
+#include "LineDialog.h"
+#include "TextDialog.h"
+#include "ExportDialog.h"
+#include "ErrDialog.h"
+#include "Legend.h"
+#include "ArrowMarker.h"
+#include "ImageMarker.h"
+#include "Graph.h"
+#include "Plot.h"
+#include "Grid.h"
+#include "PlotWizard.h"
+#include "PolynomFitDialog.h"
+#include "ExpDecayDialog.h"
+#include "FunctionDialog.h"
+#include "FitDialog.h"
+#include "SurfaceDialog.h"
+#include "Graph3D.h"
+#include "Plot3DDialog.h"
+#include "ImageDialog.h"
+#include "MultiLayer.h"
+#include "LayerDialog.h"
+#include "DataSetDialog.h"
+#include "IntDialog.h"
+#include "ConfigDialog.h"
+#ifdef ORIGIN_IMPORT
+#include "importOPJ.h"
+#endif
+#include "AssociationsDialog.h"
+#include "RenameWindowDialog.h"
+#include "QwtErrorPlotCurve.h"
+#include "InterpolationDialog.h"
+#include "ImportASCIIDialog.h"
+#include "ImageExportDialog.h"
+#include "SmoothCurveDialog.h"
+#include "FilterDialog.h"
+#include "FFTDialog.h"
+#include "Note.h"
+#include "Folder.h"
+#include "FindDialog.h"
+#include "ScaleDraw.h"
+#include "ScriptingLangDialog.h"
+#include "TableStatistics.h"
+#include "Fit.h"
+#include "MultiPeakFit.h"
+#include "PolynomialFit.h"
+#include "SigmoidalFit.h"
+#include "FunctionCurve.h"
+#include "QwtPieCurve.h"
+#include "Spectrogram.h"
+#include "Differentiation.h"
+#include "SmoothFilter.h"
+#include "FFTFilter.h"
+#include "Convolution.h"
+#include "Correlation.h"
+#include "CurveRangeDialog.h"
+#include "ColorBox.h"
+#include "QwtHistogram.h"
+#include "OpenProjectDialog.h"
+#include "core/Project.h"
+#include "core/column/Column.h"
+#include "lib/XmlStreamReader.h"
+#include "table/future_Table.h"
+
+// TODO: move tool-specific code to an extension manager
+#include "ScreenPickerTool.h"
+#include "DataPickerTool.h"
+#include "TranslateCurveTool.h"
+#include "MultiPeakFitTool.h"
+#include "LineProfileTool.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <q3listview.h>
+
+#include <QFileDialog>
+#include <QInputDialog>
+#include <QProgressDialog>
+#include <QPrintDialog>
+#include <QPixmapCache>
+#include <QMenuBar>
+#include <QClipboard>
+#include <QWorkspace>
+#include <QTranslator>
+#include <QSplitter>
+#include <QSettings>
+#include <QApplication>
+#include <QMessageBox>
+#include <QPrinter>
+#include <QActionGroup>
+#include <QAction>
+#include <QToolBar>
+#include <QKeySequence>
+#include <QImageReader>
+#include <QImageWriter>
+#include <QDateTime>
+#include <QShortcut>
+#include <QDockWidget>
+#include <QTextStream>
+#include <QVarLengthArray>
+#include <QList>
+#include <QUrl>
+#ifndef NOASSISTANT
+#include <QtAssistant/QAssistantClient>
+#endif
+#include <QStatusBar>
+#include <QToolButton>
+#include <QSignalMapper>
+#include <QUndoStack>
+#include <QtDebug>
+#include <QDialogButtonBox>
+#include <QUndoView>
+#include <QUndoStack>
+#include <QTemporaryFile>
+
+#include <zlib.h>
+
+#include <iostream>
+
+#ifdef Q_OS_WIN
+#include <io.h> // for _commit()
+#else
+#include <unistd.h> // for fsync()
+#endif
+
+using namespace Qwt3D;
+
+extern "C"
+{
+void file_compress(const char *file, const char *mode);
+}
+
+ApplicationWindow::ApplicationWindow()
+: QMainWindow(), scripted(ScriptingLangManager::newEnv(this))
+{
+ setAttribute(Qt::WA_DeleteOnClose);
+ init();
+}
+
+void ApplicationWindow::init()
+{
+ setWindowTitle(tr("SciDAVis - untitled"));
+ initGlobalConstants();
+ QPixmapCache::setCacheLimit(20*QPixmapCache::cacheLimit ());
+
+ d_project = new Project();
+ connect(d_project, SIGNAL(aspectAdded(const AbstractAspect *, int)),
+ this, SLOT(handleAspectAdded(const AbstractAspect *, int)));
+ connect(d_project, SIGNAL(aspectAboutToBeRemoved(const AbstractAspect *, int)),
+ this, SLOT(handleAspectAboutToBeRemoved(const AbstractAspect *, int)));
+
+ explorerWindow = new QDockWidget( this );
+ explorerWindow->setWindowTitle(tr("Project Explorer"));
+ explorerWindow->setObjectName("explorerWindow"); // this is needed for QMainWindow::restoreState()
+ explorerWindow->setMinimumHeight(150);
+ addDockWidget( Qt::BottomDockWidgetArea, explorerWindow );
+
+ folders = new FolderListView();
+ folders->header()->setClickEnabled( false );
+ folders->addColumn( tr("Folder") );
+ folders->setRootIsDecorated( true );
+ folders->setResizeMode(Q3ListView::LastColumn);
+ folders->header()->hide();
+ folders->setSelectionMode(Q3ListView::Single);
+ folders->setDefaultRenameAction(Q3ListView::Accept);
+
+ connect(folders, SIGNAL(currentChanged(Q3ListViewItem *)),
+ this, SLOT(folderItemChanged(Q3ListViewItem *)));
+ connect(folders, SIGNAL(itemRenamed(Q3ListViewItem *, int, const QString &)),
+ this, SLOT(renameFolder(Q3ListViewItem *, int, const QString &)));
+ connect(folders, SIGNAL(contextMenuRequested(Q3ListViewItem *, const QPoint &, int)),
+ this, SLOT(showFolderPopupMenu(Q3ListViewItem *, const QPoint &, int)));
+ connect(folders, SIGNAL(dragItems(QList<Q3ListViewItem *>)),
+ this, SLOT(dragFolderItems(QList<Q3ListViewItem *>)));
+ connect(folders, SIGNAL(dropItems(Q3ListViewItem *)),
+ this, SLOT(dropFolderItems(Q3ListViewItem *)));
+ connect(folders, SIGNAL(renameItem(Q3ListViewItem *)),
+ this, SLOT(startRenameFolder(Q3ListViewItem *)));
+ connect(folders, SIGNAL(addFolderItem()), this, SLOT(addFolder()));
+ connect(folders, SIGNAL(deleteSelection()), this, SLOT(deleteSelectedItems()));
+
+ current_folder = new Folder( 0, tr("UNTITLED"));
+ FolderListItem *fli = new FolderListItem(folders, current_folder);
+ current_folder->setFolderListItem(fli);
+ fli->setOpen( true );
+
+ lv = new FolderListView();
+ lv->addColumn (tr("Name"),-1 );
+ lv->addColumn (tr("Type"),-1 );
+ lv->addColumn (tr("View"),-1 );
+ lv->addColumn (tr("Created"),-1);
+ lv->addColumn (tr("Label"),-1);
+ lv->setResizeMode(Q3ListView::LastColumn);
+ lv->setMinimumHeight(80);
+ lv->setSelectionMode(Q3ListView::Extended);
+ lv->setDefaultRenameAction(Q3ListView::Accept);
+
+ explorerSplitter = new QSplitter(Qt::Horizontal, explorerWindow);
+ explorerSplitter->addWidget(folders);
+ explorerSplitter->addWidget(lv);
+ explorerWindow->setWidget(explorerSplitter);
+ explorerSplitter->setSizes( QList<int>() << 50 << 50);
+ explorerWindow->hide();
+
+ logWindow = new QDockWidget(this);
+ logWindow->setObjectName("logWindow"); // this is needed for QMainWindow::restoreState()
+ logWindow->setWindowTitle(tr("Results Log"));
+ addDockWidget( Qt::TopDockWidgetArea, logWindow );
+
+ results=new QTextEdit(logWindow);
+ results->setReadOnly (true);
+
+ logWindow->setWidget(results);
+ logWindow->hide();
+
+#ifdef SCRIPTING_CONSOLE
+ consoleWindow = new QDockWidget(this);
+ consoleWindow->setObjectName("consoleWindow"); // this is needed for QMainWindow::restoreState()
+ consoleWindow->setWindowTitle(tr("Scripting Console"));
+ addDockWidget( Qt::TopDockWidgetArea, consoleWindow );
+ console = new QTextEdit(consoleWindow);
+ console->setReadOnly(true);
+ consoleWindow->setWidget(console);
+ consoleWindow->hide();
+#endif
+
+ // Needs to be done after initialization of dock windows,
+ // because we now use QDockWidget::toggleViewAction()
+ createActions();
+ initToolBars();
+ initPlot3DToolBar();
+ initMainMenu();
+
+ d_workspace = new QWorkspace(this);
+ d_workspace->setScrollBarsEnabled(true);
+ setCentralWidget(d_workspace);
+ setAcceptDrops(true);
+
+ hiddenWindows = new QList<QWidget*>();
+ outWindows = new QList<QWidget*>();
+
+ renamedTables = QStringList();
+ readSettings();
+ createLanguagesList();
+ insertTranslatedStrings();
+
+#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") );
+ connect(actionNextWindow, SIGNAL(activated()), d_workspace, SLOT(activateNextWindow()));
+
+ actionPrevWindow = new QAction(QIcon(QPixmap(":/prev.xpm")), tr("&Previous","previous window"), this);
+ actionPrevWindow->setShortcut( tr("F6","previous window shortcut") );
+ connect(actionPrevWindow, SIGNAL(activated()), d_workspace, SLOT(activatePreviousWindow()));
+
+ connect(this, SIGNAL(modified()),this, SLOT(modifiedProject()));
+ connect(d_workspace, SIGNAL(windowActivated (QWidget*)),this, SLOT(windowActivated(QWidget*)));
+ connect(lv, SIGNAL(doubleClicke...
[truncated message content] |
|
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 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: <dpo...@us...> - 2014-10-03 13:33:49
|
Revision: 1458
http://sourceforge.net/p/scidavis/svn/1458
Author: dpozitron
Date: 2014-10-03 13:33:46 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
Revert "Don't activate on rigth click" from [r1436]
This fix regression from [r1436], due to popup-menu actions
which made to work only with active window
Revision Links:
--------------
http://sourceforge.net/p/scidavis/svn/1436
http://sourceforge.net/p/scidavis/svn/1436
Modified Paths:
--------------
branches/development/scidavis/src/ApplicationWindow.cpp
Modified: branches/development/scidavis/src/ApplicationWindow.cpp
===================================================================
--- branches/development/scidavis/src/ApplicationWindow.cpp 2014-09-30 13:13:26 UTC (rev 1457)
+++ branches/development/scidavis/src/ApplicationWindow.cpp 2014-10-03 13:33:46 UTC (rev 1458)
@@ -13565,6 +13565,8 @@
void ApplicationWindow::showWindowMenu(MyWidget * widget)
{
+ d_workspace->setActiveWindow(widget); // FIXME not user-friendly, but can't be simply removed
+
QMenu cm(this);
QMenu depend_menu(this);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dpo...@us...> - 2014-09-30 13:13:30
|
Revision: 1457
http://sourceforge.net/p/scidavis/svn/1457
Author: dpozitron
Date: 2014-09-30 13:13:26 +0000 (Tue, 30 Sep 2014)
Log Message:
-----------
Fix SIP deprecation warnings
Modified Paths:
--------------
branches/development/scidavis/python.pri
branches/development/scidavis/src/scidavis.sip
Modified: branches/development/scidavis/python.pri
===================================================================
--- branches/development/scidavis/python.pri 2014-09-28 06:43:04 UTC (rev 1456)
+++ branches/development/scidavis/python.pri 2014-09-30 13:13:26 UTC (rev 1457)
@@ -15,6 +15,7 @@
HEADERS += ../scidavis/src/PythonScript.h ../scidavis/src/PythonScripting.h
SOURCES += ../scidavis/src/PythonScript.cpp ../scidavis/src/PythonScripting.cpp
+ message("Making PyQt bindings via SIP")
unix {
INCLUDEPATH += $$system(python python-includepath.py)
contains(PRESET,mac_dist) {
@@ -96,6 +97,9 @@
$${SIP_DIR}/sipscidavisQwtPlot.cpp \
$${SIP_DIR}/sipscidavisGrid.cpp \
+
+OTHER_FILES += src/scidavis.sip
+
exists($${SIP_DIR}/sipscidavisQList.cpp) {
# SIP < 4.9
SOURCES += $${SIP_DIR}/sipscidavisQList.cpp
Modified: branches/development/scidavis/src/scidavis.sip
===================================================================
--- branches/development/scidavis/src/scidavis.sip 2014-09-28 06:43:04 UTC (rev 1456)
+++ branches/development/scidavis/src/scidavis.sip 2014-09-30 13:13:26 UTC (rev 1457)
@@ -31,7 +31,7 @@
* *
***************************************************************************/
-%Module scidavis 0
+%Module scidavis
%Import QtCore/QtCoremod.sip
%Import QtGui/QtGuimod.sip
@@ -173,14 +173,14 @@
void setValueAt(int row, double new_value);
void replaceValues(int first, const QVector<double>& new_values);
- Column * x() const /NoDerived/;
+ Column * x() const;
%MethodCode
future::Table *t = qobject_cast<future::Table *>(sipCpp->parentAspect());
if (t)
sipRes = t->column(t->colX(t->indexOfChild(sipCpp)));
%End
- Column * y() const /NoDerived/;
+ Column * y() const;
%MethodCode
future::Table *t = qobject_cast<future::Table *>(sipCpp->parentAspect());
if (t)
@@ -229,7 +229,7 @@
if (app) app->renameWindow(sipCpp, *a0);
%End
- MyWidget *clone() /NoDerived/;
+ MyWidget *clone();
%MethodCode
ApplicationWindow *app = sipscidavis_app();
if (app) sipRes = app->clone(sipCpp);
@@ -306,17 +306,17 @@
void setNumRows(int);
void setNumCols(int);
Column * column(int index) const;
- Column * column(const QString & name) const /NoDerived/;
+ Column * column(const QString & name) const;
%MethodCode
sipRes = sipCpp->d_future_table->column(*a0, false);
%End
- Column * __getitem__(int index) const /NoDerived/;
+ Column * __getitem__(int index) const;
%MethodCode
sipRes = sipCpp->column(a0);
%End
- Column * __getitem__(const QString &name) const /NoDerived/;
+ Column * __getitem__(const QString &name) const;
%MethodCode
sipRes = sipCpp->column(*a0);
%End
@@ -380,14 +380,14 @@
void importASCII(const QString&, const QString&="\t", int=0, bool=false, bool=true, bool=false, bool=false);
bool exportASCII(const QString&, const QString&="\t", bool=false, bool=false);
- void normalize(SIP_PYOBJECT) /NoDerived/;
+ void normalize(SIP_PYOBJECT);
%MethodCode
sipIsErr = 0;
CHECK_TABLE_COL(a0);
if (sipIsErr == 0)
sipCpp->d_future_table->normalizeColumns(QList< Column* >() << sipCpp->column(col));
%End
- void normalize() /NoDerived/;
+ void normalize();
%MethodCode
QList< Column* > cols;
for (int i=0; i<sipCpp->numCols(); i++)
@@ -395,14 +395,14 @@
sipCpp->d_future_table->normalizeColumns(cols);
%End
- void sortColumn(SIP_PYOBJECT, int order = 0) /NoDerived/;
+ void sortColumn(SIP_PYOBJECT, int order = 0);
%MethodCode
sipIsErr = 0;
CHECK_TABLE_COL(a0);
if (sipIsErr == 0)
sipCpp->d_future_table->sortColumns(0, QList<Column*>() << sipCpp->column(col), a1==0);
%End
- void sort(int type = 0, int order = 0, const QString& leadCol = QString()) /NoDerived/;
+ void sort(int type = 0, int order = 0, const QString& leadCol = QString());
%MethodCode
Column * lead;
if (a0 == 0)
@@ -658,7 +658,7 @@
// convenience methods for scripting
- void setColor(const QColor& color) /NoDerived/;
+ void setColor(const QColor& color);
%MethodCode
QPen pen = sipCpp->pen();
pen.setColor(*a0);
@@ -667,7 +667,7 @@
brush.setColor(*a0);
sipCpp->setBrush(brush);
%End
- void setColor(int color) /NoDerived/;
+ void setColor(int color);
%MethodCode
QPen pen = sipCpp->pen();
pen.setColor(ColorBox::color(a0));
@@ -676,25 +676,25 @@
brush.setColor(ColorBox::color(a0));
sipCpp->setBrush(brush);
%End
- void setOutlineColor(const QColor& color) /NoDerived/;
+ void setOutlineColor(const QColor& color);
%MethodCode
QPen pen = sipCpp->pen();
pen.setColor(*a0);
sipCpp->setPen(pen);
%End
- void setOutlineColor(int color) /NoDerived/;
+ void setOutlineColor(int color);
%MethodCode
QPen pen = sipCpp->pen();
pen.setColor(ColorBox::color(a0));
sipCpp->setPen(pen);
%End
- void setFillColor(const QColor& color) /NoDerived/;
+ void setFillColor(const QColor& color);
%MethodCode
QBrush brush = sipCpp->brush();
brush.setColor(*a0);
sipCpp->setBrush(brush);
%End
- void setFillColor(int color) /NoDerived/;
+ void setFillColor(int color);
%MethodCode
QBrush brush = sipCpp->brush();
brush.setColor(ColorBox::color(a0));
@@ -731,7 +731,7 @@
// convenience methods for scripting
- void setColor(const QColor& color) /NoDerived/;
+ void setColor(const QColor& color);
%MethodCode
QPen pen = sipCpp->pen();
pen.setColor(*a0);
@@ -740,7 +740,7 @@
brush.setColor(*a0);
sipCpp->setBrush(brush);
%End
- void setColor(int color) /NoDerived/;
+ void setColor(int color);
%MethodCode
QPen pen = sipCpp->pen();
pen.setColor(ColorBox::color(a0));
@@ -749,31 +749,31 @@
brush.setColor(ColorBox::color(a0));
sipCpp->setBrush(brush);
%End
- void setOutlineColor(const QColor& color) /NoDerived/;
+ void setOutlineColor(const QColor& color);
%MethodCode
QPen pen = sipCpp->pen();
pen.setColor(*a0);
sipCpp->setPen(pen);
%End
- void setOutlineColor(int color) /NoDerived/;
+ void setOutlineColor(int color);
%MethodCode
QPen pen = sipCpp->pen();
pen.setColor(ColorBox::color(a0));
sipCpp->setPen(pen);
%End
- void setFillColor(const QColor& color) /NoDerived/;
+ void setFillColor(const QColor& color);
%MethodCode
QBrush brush = sipCpp->brush();
brush.setColor(*a0);
sipCpp->setBrush(brush);
%End
- void setFillColor(int color) /NoDerived/;
+ void setFillColor(int color);
%MethodCode
QBrush brush = sipCpp->brush();
brush.setColor(ColorBox::color(a0));
sipCpp->setBrush(brush);
%End
- void setFillStyle(Qt::BrushStyle style) /NoDerived/;
+ void setFillStyle(Qt::BrushStyle style);
%MethodCode
QBrush brush = sipCpp->brush();
brush.setStyle(a0);
@@ -838,24 +838,24 @@
void setMinPenY(const QPen &p) /PyName=setYMinorPen/;
const QPen& minPenY() const /PyName=yMinorPen/;
- void setMajor(bool) /NoDerived/;
+ void setMajor(bool);
%MethodCode
sipCpp->enableX(a0);
sipCpp->enableY(a0);
%End
- void setMinor(bool) /NoDerived/;
+ void setMinor(bool);
%MethodCode
sipCpp->enableXMin(a0);
sipCpp->enableYMin(a0);
%End
- void setMajorPen(const QPen &p) /NoDerived/;
+ void setMajorPen(const QPen &p);
%MethodCode
sipCpp->setMajPenX(*a0);
sipCpp->setMajPenY(*a0);
%End
- void setMinorPen(const QPen &p) /NoDerived/;
+ void setMinorPen(const QPen &p);
%MethodCode
sipCpp->setMinPenX(*a0);
sipCpp->setMinPenY(*a0);
@@ -881,7 +881,7 @@
sipRes = PyString_FromString(sipCpp->pieLegendText());
%End
- bool insertCurve(Table*, const QString&, int=1, int color=-1) /NoDerived/;
+ bool insertCurve(Table*, const QString&, int=1, int color=-1);
%MethodCode
if (sipCpp->insertCurve(a0, *a1, a2)) {
CurveLayout cl = sipCpp->initCurveLayout(a2, 1);
@@ -910,7 +910,7 @@
sipRes = false;
%End
bool insertFunctionCurve(const QString &formula, double from=0, double to=1, int points=100,
- const QString &title = QString::null) /NoDerived/;
+ const QString &title = QString::null);
%MethodCode
ApplicationWindow *app = sipscidavis_app();
if (app)
@@ -921,7 +921,7 @@
%End
bool insertPolarCurve(const QString &radial, const QString &angular,
double from=0, double to=2*M_PI, const QString ¶meter="t", int points=100,
- const QString &title = QString::null) /NoDerived/;
+ const QString &title = QString::null);
%MethodCode
ApplicationWindow *app = sipscidavis_app();
if (app)
@@ -932,7 +932,7 @@
%End
bool insertParametricCurve(const QString &x, const QString &y,
double from=0, double to=1, const QString ¶meter="t", int points=100,
- const QString &title =QString::null) /NoDerived/;
+ const QString &title =QString::null);
%MethodCode
ApplicationWindow *app = sipscidavis_app();
if (app)
@@ -946,7 +946,7 @@
void removeCurve(const QString&);
void deleteFitCurves();
int curves() /PyName=numCurves/;
- QList<QwtPlotCurve*> curves() const /NoDerived/;
+ QList<QwtPlotCurve*> curves() const;
%MethodCode
sipRes = new QList<QwtPlotCurve*>();
for (int i = 0; i<sipCpp->curves(); i++)
@@ -969,7 +969,7 @@
void setTitle(const QString& t);
Legend* newLegend();
Legend* newLegend(const QString&);
- void setLegend(const QString&) /NoDerived/;
+ void setLegend(const QString&);
%MethodCode
sipCpp->legend()->setText(*a0);
%End
@@ -1010,12 +1010,12 @@
void setAutoscaleFonts(bool = true);
void setAntialiasing(bool on = true, bool update = true);
- QWidget * canvas() const /NoDerived/;
+ QWidget * canvas() const;
%MethodCode
sipRes = sipCpp->d_plot->canvas();
%End
- QPointF pickPoint() const /NoDerived/;
+ QPointF pickPoint() const;
%MethodCode
ApplicationWindow *app = sipscidavis_app();
sipRes = new QPointF();
@@ -1057,7 +1057,7 @@
// for backwards-compatibility
void setAlignement (int, int);
void setAlignement (int, int) /PyName=setAlignment/;
- void arrangeLayers(bool fit = true) /NoDerived/;
+ void arrangeLayers(bool fit = true);
%MethodCode
sipCpp->arrangeLayers(a0, false);
%End
@@ -1166,7 +1166,7 @@
// a bugfix release though, since an unexpected change in behaviour may be even
// more confusing than the inconsistency.
Note* newNote(const QString& = QString::null);
- MultiLayer *plot(Table*, SIP_PYTUPLE, int style=1, int color=-1) /NoDerived/;
+ MultiLayer *plot(Table*, SIP_PYTUPLE, int style=1, int color=-1);
%MethodCode
QStringList l;
int n = PyTuple_Size(a1);
@@ -1203,7 +1203,7 @@
}
}
%End
- MultiLayer *plot(Table*, const QString&, int style=1, int color=-1) /NoDerived/;
+ MultiLayer *plot(Table*, const QString&, int style=1, int color=-1);
%MethodCode
if (a0==0) {
sipIsErr = 1;
@@ -1241,7 +1241,7 @@
// QTextEdit *console;
// folders
- Folder *activeFolder() /NoDerived/;
+ Folder *activeFolder();
%MethodCode
sipRes = sipCpp->current_folder;
%End
@@ -1905,14 +1905,14 @@
Folder* rootFolder();
- void save(const QString &filename) /NoDerived/;
+ void save(const QString &filename);
%MethodCode
ApplicationWindow *app = sipscidavis_app();
if (app)
app->saveFolder(sipCpp, *a0);
%End
- void addChild(Folder *f /Transfer/) /NoDerived/;
+ void addChild(Folder *f /Transfer/);
%MethodCode
QString name = a0->objectName();
int i = 1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hp...@us...> - 2014-09-28 06:43:08
|
Revision: 1456
http://sourceforge.net/p/scidavis/svn/1456
Author: hpcoder
Date: 2014-09-28 06:43:04 +0000 (Sun, 28 Sep 2014)
Log Message:
-----------
Workaround fix for ticket #205.
Modified Paths:
--------------
branches/development/scidavis/src/MuParserScript.cpp
Modified: branches/development/scidavis/src/MuParserScript.cpp
===================================================================
--- branches/development/scidavis/src/MuParserScript.cpp 2014-09-23 00:19:48 UTC (rev 1455)
+++ branches/development/scidavis/src/MuParserScript.cpp 2014-09-28 06:43:04 UTC (rev 1456)
@@ -140,13 +140,16 @@
m_parser.SetVarFactory(variableFactory, this);
// redefine characters for operators to include ";"
- m_parser.DefineOprtChars(
+ static const char opChars[]=
// standard operator chars as defined in mu::Parser::InitCharSets()
"abcdefghijklmnopqrstuvwxyz"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"+-*^/?<>=#!$%&|~'_"
// our additions
- ";");
+ ";";
+ m_parser.DefineOprtChars(opChars);
+ // work around muparser bug number 6 https://code.google.com/p/muparser/issues/detail?id=6
+ m_parser.DefineInfixOprtChars(opChars);
// statement separation needs lower precedence than everything else; assignment has precedence
// -1, everything else defined in mu::Parser has non-negative precedence
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hp...@us...> - 2014-09-23 00:19:59
|
Revision: 1455
http://sourceforge.net/p/scidavis/svn/1455
Author: hpcoder
Date: 2014-09-23 00:19:48 +0000 (Tue, 23 Sep 2014)
Log Message:
-----------
Fix for NaNs appearing in integration for ticket #201
Modified Paths:
--------------
branches/development/scidavis/src/Filter.cpp
Modified: branches/development/scidavis/src/Filter.cpp
===================================================================
--- branches/development/scidavis/src/Filter.cpp 2014-09-21 10:59:26 UTC (rev 1454)
+++ branches/development/scidavis/src/Filter.cpp 2014-09-23 00:19:48 UTC (rev 1455)
@@ -40,6 +40,9 @@
#include <gsl/gsl_sort.h>
+#include <algorithm>
+using namespace std;
+
Filter::Filter( ApplicationWindow *parent, Graph *g, QString name)
: QObject(parent)
{
@@ -86,28 +89,32 @@
void Filter::setDataCurve(int curve, double start, double end)
{
- if (start > end) qSwap(start, end);
+ if (start > end) qSwap(start, end);
- if (d_n > 0)
- {//delete previousely allocated memory
- delete[] d_x;
- delete[] d_y;
- }
+ if (d_n > 0)
+ {//delete previousely allocated memory
+ delete[] d_x;
+ delete[] d_y;
+ }
- d_init_err = false;
- d_curve = d_graph->curve(curve);
- if (d_sort_data)
- d_n = sortedCurveData(d_curve, start, end, &d_x, &d_y);
- else
- d_n = curveData(d_curve, start, end, &d_x, &d_y);
+ d_init_err = false;
+ d_curve = d_graph->curve(curve);
+ if (d_sort_data)
+ d_n = sortedCurveData(d_curve, start, end, &d_x, &d_y);
+ else
+ d_n = curveData(d_curve, start, end, &d_x, &d_y);
- if (!isDataAcceptable()) {
- d_init_err = true;
- return;
- }
+ if (!isDataAcceptable()) {
+ d_init_err = true;
+ return;
+ }
- d_from = start;
- d_to = end;
+ // ensure range is within data range
+ if (d_n>0)
+ {
+ d_from = max(start, *min_element(d_x,d_x+d_n));
+ d_to = min(end, *max_element(d_x,d_x+d_n));
+ }
}
bool Filter::isDataAcceptable() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hp...@us...> - 2014-09-21 10:59:33
|
Revision: 1454
http://sourceforge.net/p/scidavis/svn/1454
Author: hpcoder
Date: 2014-09-21 10:59:26 +0000 (Sun, 21 Sep 2014)
Log Message:
-----------
Integrated Fellype's fix for ticket #209
Modified Paths:
--------------
branches/development/scidavis/src/Integration.cpp
Modified: branches/development/scidavis/src/Integration.cpp
===================================================================
--- branches/development/scidavis/src/Integration.cpp 2014-09-21 07:34:53 UTC (rev 1453)
+++ branches/development/scidavis/src/Integration.cpp 2014-09-21 10:59:26 UTC (rev 1454)
@@ -79,6 +79,12 @@
case Akima:
method_t = gsl_interp_akima;
break;
+ default:
+ QMessageBox::critical((ApplicationWindow *)parent(), tr("SciDAVis") + " - " + tr("Error"),
+ tr("Unknown interpolation method. Valid values are: 0 - Linear, 1 - Cubic, 2 - Akima."));
+ d_init_err = true;
+ return true;
+
}
// GSL interpolation routines fail with division by zero on such data
for (int i=1; i<d_n; i++)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hp...@us...> - 2014-09-21 07:34:59
|
Revision: 1453
http://sourceforge.net/p/scidavis/svn/1453
Author: hpcoder
Date: 2014-09-21 07:34:53 +0000 (Sun, 21 Sep 2014)
Log Message:
-----------
Fix for ticket #193
Modified Paths:
--------------
branches/development/scidavis/src/PlotCurve.cpp
Modified: branches/development/scidavis/src/PlotCurve.cpp
===================================================================
--- branches/development/scidavis/src/PlotCurve.cpp 2014-09-17 06:40:34 UTC (rev 1452)
+++ branches/development/scidavis/src/PlotCurve.cpp 2014-09-21 07:34:53 UTC (rev 1453)
@@ -92,11 +92,11 @@
{
QString s = title().text();
QStringList lst = s.split("_", QString::SkipEmptyParts);
- if (lst[0] == oldName)
+ if (lst.size()>0 && lst[0] == oldName)
setTitle(newName + "_" + lst[1]);
lst = d_x_column.split("_", QString::SkipEmptyParts);
- if (lst[0] == oldName)
+ if (lst.size()>0 && lst[0] == oldName)
d_x_column = newName + "_" + lst[1];
}
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hp...@us...> - 2014-09-17 06:40:43
|
Revision: 1452
http://sourceforge.net/p/scidavis/svn/1452
Author: hpcoder
Date: 2014-09-17 06:40:34 +0000 (Wed, 17 Sep 2014)
Log Message:
-----------
Committed patch change by StrPt as patch #10.
Modified Paths:
--------------
branches/development/scidavis/scidavis.desktop
branches/development/scidavis/scidavis.xml
branches/development/scidavis/x-sciprj.desktop
Modified: branches/development/scidavis/scidavis.desktop
===================================================================
--- branches/development/scidavis/scidavis.desktop 2014-09-16 17:58:55 UTC (rev 1451)
+++ branches/development/scidavis/scidavis.desktop 2014-09-17 06:40:34 UTC (rev 1452)
@@ -4,8 +4,45 @@
Name=SciDAVis
Comment=Application for scientific data analysis and visualization
Comment[de]=Programm zur wissenschaftlichen Datenauswertung und Visualisierung
-Comment[fr]=Outil d'analyse scientifique de données
+Comment[fr]=Application d'analyse et de visualisation de données scientifiques
Comment[pt_BR]=Programa para visualização e análise da dados científico
+Comment[af]=Toepassing vir wetenskaplike data analise en visualisasie
+Comment[sq]=Program për analizën dhe shfaqjen e të dhënave shkencore
+Comment[ast]=Aplicación pa visualización y analís de datos científicos
+Comment[bs]=Program za proučavanje naučnih podataka i predočenje
+Comment[bn]=বৈজ্ঞানিক উপাত্ত বিশ্লেষণ এবং কল্পনার জন্য অ্যাপ্লিকেশন
+Comment[bg]=Приложение за анализиране и визуализиране на научни данни
+Comment[ca]=Aplicació per a l'anàlisi i visualització de dades científiques
+Comment[ca@valencia]=Aplicació per a l'anàlisi i visualització de dades científiques
+Comment[zh_HK]=為科學資料進行分析及視覺化的應用程式
+Comment[zh_TW]=為科學資料進行分析及視覺化的應用程式
+Comment[crh]=Bilimsel veri analizi ve görselleştirilmesi için uygulama
+Comment[zh_CN]=科学数据分析和可视化应用程序
+Comment[da]=Program til videnskabelig dataanalyse og -visualisering
+Comment[nl]=Applicatie voor wetenschappelijke data-analyse en visualisatie
+Comment[cs]=Aplikace pro zpracování a analýzu vědeckých dat
+Comment[et]=Teadusandmete analüüsimise ja visualiseerimise rakendus
+Comment[fi]=Sovellus tieteellisen datan analysointiin ja visualisointiin
+Comment[gl]=Aplicativo para a análise e visualización de datos científicos
+Comment[el]=Εφαρμογή για ανάλυση και απεικόνιση επιστημονικών δεδομένων
+Comment[hu]=Tudományos adatelemző és -vizualizációs alkalmazás
+Comment[it]=Applicazione per la visualizzazione e l'analisi scientifica dei dati
+Comment[ja]=科学データの分析および可視化用アプリケーション
+Comment[ky]=Илимий берилиштерди анализдөө жана көрсөтүү үчүн тирекеме
+Comment[lt]=Programa mokslinių duomenų analizei ir vizualizavimui
+Comment[ms]=Aplikasi untuk analisis dan pengvisualan data saintifik
+Comment[oc]=Aplicacion d'analisi e de visualizacion de donadas scientificas
+Comment[nb]=Applikasjon for vitenskapelig dataanalyse og visualisering
+Comment[pl]=Aplikacja do wizualizacji i analizy danych naukowych
+Comment[pt]=Aplicação para visualização e análise de dados científicos
+Comment[ro]=Aplicație pentru vizualizarea și analiza datelor științifice
+Comment[ru]=Приложение для анализа и отображения научных данных
+Comment[sl]=Program za preučevanje znanstvenih podatkov in predočenje
+Comment[es]=Aplicación para visualización y análisis de datos científicos
+Comment[sv]=Vetenskaplig dataanalys och visualisering
+Comment[uk]=Програма для візуалізації та наукового аналізу даних
+Comment[tr]=Bilimsel veri analizi ve görselleştirilmesi için uygulama
+Comment[vi]=Ứng dụng hình ảnh hoá và phân tích dữ liệu khoa học
Icon=scidavis
Exec=scidavis
Terminal=false
Modified: branches/development/scidavis/scidavis.xml
===================================================================
--- branches/development/scidavis/scidavis.xml 2014-09-16 17:58:55 UTC (rev 1451)
+++ branches/development/scidavis/scidavis.xml 2014-09-17 06:40:34 UTC (rev 1452)
@@ -5,6 +5,7 @@
<comment xml:lang="de">SciDAVis-Projekt</comment>
<comment xml:lang="fr">Projet Scidavis</comment>
<comment xml:lang="pt_BR">Projeto do SciDAVis</comment>
+ <comment xml:lang="ru">Проект SciDAVis</comment>
<magic priority="100">
<match type="string" value="SciDAVis" offset="0"/>
</magic>
Modified: branches/development/scidavis/x-sciprj.desktop
===================================================================
--- branches/development/scidavis/x-sciprj.desktop 2014-09-16 17:58:55 UTC (rev 1451)
+++ branches/development/scidavis/x-sciprj.desktop 2014-09-17 06:40:34 UTC (rev 1452)
@@ -8,4 +8,4 @@
Comment[de]=SciDAVis-Projekt
Comment[fr]=Projet Scidavis
Comment[pt_BR]=Projeto do SciDAVis
-
+Comment[ru]=Проект SciDAVis
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dpo...@us...> - 2014-09-16 17:58:58
|
Revision: 1451
http://sourceforge.net/p/scidavis/svn/1451
Author: dpozitron
Date: 2014-09-16 17:58:55 +0000 (Tue, 16 Sep 2014)
Log Message:
-----------
Export and copy to clipboard functions of Graph/Multilayer rewrited order to fix bug #245
This change just first step to fix this bug. The commit removes much tricky code. But big
changes causes regressions, so, i want to test it before proceed.
Known issues:
- Layer frame not printed
- Transparency feature is dropped
- DPI feature is temporary disabled
- Print code not rewrited yet
- New behaviour allows resize image when exporting, but no interface for that
Modified Paths:
--------------
branches/development/scidavis/src/ApplicationWindow.cpp
branches/development/scidavis/src/Graph.cpp
branches/development/scidavis/src/Graph.h
branches/development/scidavis/src/ImageExportDialog.cpp
branches/development/scidavis/src/ImageExportDialog.h
branches/development/scidavis/src/MultiLayer.cpp
branches/development/scidavis/src/MultiLayer.h
branches/development/scidavis/src/Plot.cpp
branches/development/scidavis/src/Plot.h
branches/development/scidavis/src/scidavis.sip
Modified: branches/development/scidavis/src/ApplicationWindow.cpp
===================================================================
--- branches/development/scidavis/src/ApplicationWindow.cpp 2014-08-26 23:50:25 UTC (rev 1450)
+++ branches/development/scidavis/src/ApplicationWindow.cpp 2014-09-16 17:58:55 UTC (rev 1451)
@@ -4752,9 +4752,9 @@
{
if (selected_filter.contains("." + (list[i]).toLower())) {
if (plot2D)
- plot2D->exportImage(file_name, ied->quality(), ied->transparency());
+ plot2D->exportImage(file_name, ied->quality());
else if (plot3D)
- plot3D->exportImage(file_name, ied->quality(), ied->transparency());
+ plot3D->exportImage(file_name, ied->quality());
}
}
}
@@ -4801,7 +4801,7 @@
QList<QByteArray> list = QImageWriter::supportedImageFormats();
for (int i=0; i<(int)list.count(); i++)
if (selected_filter.contains("."+(list[i]).toLower()))
- g->exportImage(file_name, ied->quality(), ied->transparency());
+ g->exportImage(file_name, ied->quality());
}
}
@@ -4894,9 +4894,9 @@
{
if (file_suffix.contains("." + (list[i]).toLower())) {
if (plot2D)
- plot2D->exportImage(file_name, ied->quality(), ied->transparency());
+ plot2D->exportImage(file_name, ied->quality());
else if (plot3D)
- plot3D->exportImage(file_name, ied->quality(), ied->transparency());
+ plot3D->exportImage(file_name, ied->quality());
}
}
}
@@ -5773,7 +5773,6 @@
connect (pd,SIGNAL(updateMeshLineWidth(int)), g,SLOT(setMeshLineWidth(int)));
connect (pd,SIGNAL(updateBars(double)),g,SLOT(updateBars(double)));
connect (pd,SIGNAL(updatePoints(double, bool)),g, SLOT(updatePoints(double, bool)));
- connect (pd,SIGNAL(updateTransparency(double)),g, SLOT(changeTransparency(double)));
connect (pd,SIGNAL(showWorksheet()),g,SLOT(showWorksheet()));
connect (pd,SIGNAL(updateZoom(double)),g,SLOT(updateZoom(double)));
connect (pd,SIGNAL(updateScaling(double,double,double)), g,SLOT(updateScaling(double,double,double)));
@@ -5781,7 +5780,6 @@
connect (pd,SIGNAL(updateCross(double, double, bool, bool)), g,SLOT(updateCross(double, double, bool, bool)));
pd->setMeshLineWidth(g->meshLineWidth());
- pd->setTransparency(g->transparency());
pd->setDataColors(g->minDataColor(),g->maxDataColor());
pd->setColors(g->titleColor(),g->meshColor(),g->axesColor(),g->numColor(),
g->labelColor(), g->bgColor(),g->gridColor());
Modified: branches/development/scidavis/src/Graph.cpp
===================================================================
--- branches/development/scidavis/src/Graph.cpp 2014-08-26 23:50:25 UTC (rev 1450)
+++ branches/development/scidavis/src/Graph.cpp 2014-09-16 17:58:55 UTC (rev 1451)
@@ -1347,14 +1347,11 @@
void Graph::copyImage()
{
- QApplication::clipboard()->setPixmap(graphPixmap(), QClipboard::Clipboard);
+ QImage image(d_plot->size(), QImage::Format_ARGB32);
+ exportPainter(image);
+ QApplication::clipboard()->setImage(image);
}
-QPixmap Graph::graphPixmap()
-{
- return QPixmap::grabWidget(this);
-}
-
void Graph::exportToFile(const QString& fileName)
{
if ( fileName.isEmpty() ){
@@ -1380,32 +1377,11 @@
}
}
-void Graph::exportImage(const QString& fileName, int quality, bool transparent)
+void Graph::exportImage(const QString& fileName, int quality)
{
- QPixmap pic = graphPixmap();
-
- if (transparent){
- QBitmap mask(pic.size());
- mask.fill(Qt::color1);
- QPainter p;
- p.begin(&mask);
- p.setPen(Qt::color0);
-
- QColor background = QColor (Qt::white);
- QRgb backgroundPixel = background.rgb ();
- QImage image = pic.convertToImage();
- for (int y=0; y<image.height(); y++){
- for ( int x=0; x<image.width(); x++ ){
- QRgb rgb = image.pixel(x, y);
- if (rgb == backgroundPixel) // we want the frame transparent
- p.drawPoint(x, y);
- }
- }
- p.end();
- pic.setMask(mask);
- }
-
- pic.save(fileName, 0, quality);
+ QImage image(size(), QImage::Format_ARGB32);
+ exportPainter(image);
+ image.save(fileName, 0, quality);
}
void Graph::exportVector(const QString& fileName, int res, bool color, bool keepAspect, QPrinter::PageSize pageSize, QPrinter::Orientation orientation)
@@ -1418,8 +1394,6 @@
QPrinter printer;
printer.setCreator("SciDAVis");
printer.setFullPage(true);
- if (res)
- printer.setResolution(res);
printer.setOutputFileName(fileName);
if (fileName.contains(".eps"))
@@ -1430,40 +1404,15 @@
else
printer.setColorMode(QPrinter::GrayScale);
- QRect plotRect = d_plot->rect();
- printer.setOrientation(orientation);
if (pageSize == QPrinter::Custom)
- printer.setPageSize(minPageSize(printer, plotRect));
+ printer.setPaperSize(size(), QPrinter::Point);
else
- printer.setPageSize(pageSize);
-
- double plot_aspect = double(d_plot->frameGeometry().width())/double(d_plot->frameGeometry().height());
-
- if (keepAspect){// export should preserve plot aspect ratio
- double page_aspect = double(printer.width())/double(printer.height());
- if (page_aspect > plot_aspect){
- int margin = (int) ((0.1/2.54)*printer.logicalDpiY()); // 1 mm margins
- int height = printer.height() - 2*margin;
- int width = int(height*plot_aspect);
- int x = (printer.width()- width)/2;
- plotRect = QRect(x, margin, width, height);
- } else if (plot_aspect >= page_aspect){
- int margin = (int) ((0.1/2.54)*printer.logicalDpiX()); // 1 mm margins
- int width = printer.width() - 2*margin;
- int height = int(width/plot_aspect);
- int y = (printer.height()- height)/2;
- plotRect = QRect(margin, y, width, height);
- }
- } else {
- int x_margin = (int) ((0.1/2.54)*printer.logicalDpiX()); // 1 mm margins
- int y_margin = (int) ((0.1/2.54)*printer.logicalDpiY()); // 1 mm margins
- int width = printer.width() - 2*x_margin;
- int height = printer.height() - 2*y_margin;
- plotRect = QRect(x_margin, y_margin, width, height);
+ {
+ printer.setOrientation(orientation);
+ printer.setPaperSize(pageSize);
}
- QPainter paint(&printer);
- print(&paint, plotRect);
+ exportPainter(printer, keepAspect);
}
void Graph::print()
@@ -1526,23 +1475,45 @@
void Graph::exportSVG(const QString& fname)
{
- #if QT_VERSION >= 0x040300
- QSvgGenerator svg;
- svg.setFileName(fname);
- svg.setSize(d_plot->size());
- // Workaround for resolution-dependent bug somewhere between Qt and Qwt:
- // While QwtText uses QTextDocument to draw rich texts, it introduces
- // or triggers a layout bug concerning sub- and superscripts. This is all pretty
- // obscure, since exporting to SVG/EPS @ 96 dpi doesn't trigger the bug, nor does
- // exporting to EPS @ 72 dpi; but exporting to SVG @ 72 dpi (the default) does.
- svg.setResolution(96);
+#if QT_VERSION >= 0x040300
+ QSvgGenerator svg;
+ svg.setFileName(fname);
+#if QT_VERSION >= 0x040500
+ svg.setSize(d_plot->size());
+ svg.setViewBox(d_plot->rect());
+ svg.setResolution(96); // FIXME hardcored
+ svg.setTitle(this->objectName());
+#endif
+ exportPainter(svg);
+#endif
+}
- QPainter p(&svg);
- print(&p, d_plot->rect());
- p.end();
- #endif
+void Graph::exportPainter(QPaintDevice& paintDevice, bool keepAspect, QRect rect)
+{
+ QPainter p(&paintDevice);
+ exportPainter(p, keepAspect, rect, QSize(paintDevice.width(), paintDevice.height()));
+ p.end();
}
+void Graph::exportPainter(QPainter &painter, bool keepAspect, QRect rect, QSize size)
+ {
+ if (size == QSize()) size = d_plot->size();
+ if (rect == QRect()) rect = d_plot->rect();
+ if (keepAspect)
+ {
+ QSize scaled = rect.size();
+ scaled.scale(size, Qt::KeepAspectRatio);
+ size = scaled;
+ }
+
+ painter.scale(
+ (double)size.width()/(double)rect.width(),
+ (double)size.height()/(double)rect.height()
+ );
+
+ print(&painter, rect);
+ }
+
int Graph::selectedCurveID()
{
if (d_range_selector)
@@ -5469,175 +5440,10 @@
return a;
}
-/* workaround for axis gaps */
void Graph::print(QPainter *painter, const QRect &plotRect,
- const QwtPlotPrintFilter &pfilter)
+ const QwtPlotPrintFilter &pfilter)
{
- int axisId;
-
- if ( painter == 0 || !painter->isActive() ||
- !plotRect.isValid() || size().isNull() )
- return;
-
- deselect();
-
- QwtText t = d_plot->title();
- d_plot->printFrame(painter, plotRect);
-
- painter->save();
-
- // All paint operations need to be scaled according to
- // the paint device metrics.
-
- QwtPainter::setMetricsMap(this, painter->device());
- const QwtMetricsMap &metricsMap = QwtPainter::metricsMap();
-
- // It is almost impossible to integrate into the Qt layout
- // framework, when using different fonts for printing
- // and screen. To avoid writing different and Qt unconform
- // layout engines we change the widget attributes, print and
- // reset the widget attributes again. This way we produce a lot of
- // useless layout events ...
-
- pfilter.apply(d_plot);
-
- int baseLineDists[QwtPlot::axisCnt];
- if (pfilter.options() & QwtPlotPrintFilter::PrintFrameWithScales){
- // In case of no background we set the backbone of
- // the scale on the frame of the canvas.
-
- for (axisId = 0; axisId < QwtPlot::axisCnt; axisId++ ){
- QwtScaleWidget *scaleWidget = (QwtScaleWidget *)d_plot->axisWidget(axisId);
- if ( scaleWidget ){
- baseLineDists[axisId] = scaleWidget->margin();
- scaleWidget->setMargin(0);
- }
- }
- }
- // Calculate the layout for the print.
-
- int layoutOptions = QwtPlotLayout::IgnoreScrollbars;
- if ( !(pfilter.options() & QwtPlotPrintFilter::PrintMargin) )
- layoutOptions |= QwtPlotLayout::IgnoreMargin;
- if ( !(pfilter.options() & QwtPlotPrintFilter::PrintLegend) )
- layoutOptions |= QwtPlotLayout::IgnoreLegend;
-
- int bw = d_plot->lineWidth();
- d_plot->plotLayout()->activate(d_plot,
- QwtPainter::metricsMap().deviceToLayout(plotRect.adjusted(bw, bw, -bw, -bw)),
- layoutOptions);
-
- if ((pfilter.options() & QwtPlotPrintFilter::PrintTitle)
- && (!d_plot->titleLabel()->text().isEmpty())){
- d_plot->printTitle(painter, d_plot->plotLayout()->titleRect());
- }
-
- bw = d_plot->canvas()->lineWidth();
- QRect canvasRect = d_plot->plotLayout()->canvasRect().adjusted(bw, bw, -bw, -bw);
-
- for ( axisId = 0; axisId < QwtPlot::axisCnt; axisId++ ){
- QwtScaleWidget *scaleWidget = (QwtScaleWidget *)d_plot->axisWidget(axisId);
- if (scaleWidget){
- int baseDist = scaleWidget->margin();
-
- int startDist, endDist;
- scaleWidget->getBorderDistHint(startDist, endDist);
-
- QRect scaleRect = d_plot->plotLayout()->scaleRect(axisId);
- if (!scaleWidget->margin()){
- switch(axisId){
- case QwtPlot::xBottom:
- scaleRect.translate(0, canvasRect.bottom() - scaleRect.top());
- break;
- case QwtPlot::xTop:
- scaleRect.translate(0, canvasRect.top() - scaleRect.bottom());
- break;
- case QwtPlot::yLeft:
- scaleRect.translate(canvasRect.left() - scaleRect.right(), 0);
- break;
- case QwtPlot::yRight:
- scaleRect.translate(canvasRect.right() - scaleRect.left(), 0);
- break;
- }
- }
- d_plot->printScale(painter, axisId, startDist, endDist, baseDist, scaleRect);
- }
- }
-
- /*
- The border of the bounding rect needs to ba scaled to
- layout coordinates, so that it is aligned to the axes
- */
- QRect boundingRect( canvasRect.left() - 1, canvasRect.top() - 1,
- canvasRect.width() + 2, canvasRect.height() + 2);
- boundingRect = metricsMap.layoutToDevice(boundingRect);
- boundingRect.setWidth(boundingRect.width() - 1);
- boundingRect.setHeight(boundingRect.height() - 1);
-
- canvasRect = metricsMap.layoutToDevice(canvasRect);
-
- // When using QwtPainter all sizes where computed in pixel
- // coordinates and scaled by QwtPainter later. This limits
- // the precision to screen resolution. A much better solution
- // is to scale the maps and print in unlimited resolution.
-
- QwtScaleMap map[QwtPlot::axisCnt];
- for (axisId = 0; axisId < QwtPlot::axisCnt; axisId++){
- map[axisId].setTransformation(d_plot->axisScaleEngine(axisId)->transformation());
-
- const QwtScaleDiv &scaleDiv = *(d_plot->axisScaleDiv(axisId));
-#if QWT_VERSION >= 0x050200
- map[axisId].setScaleInterval(scaleDiv.lowerBound(), scaleDiv.upperBound());
-#else
- map[axisId].setScaleInterval(scaleDiv.lBound(), scaleDiv.hBound());
-#endif
-
- double from, to;
- if ( d_plot->axisEnabled(axisId) ){
- const int sDist = d_plot->axisWidget(axisId)->startBorderDist();
- const int eDist = d_plot->axisWidget(axisId)->endBorderDist();
- const QRect &scaleRect = d_plot->plotLayout()->scaleRect(axisId);
-
- if ( axisId == QwtPlot::xTop || axisId == QwtPlot::xBottom ){
- from = metricsMap.layoutToDeviceX(scaleRect.left() + sDist);
- to = metricsMap.layoutToDeviceX(scaleRect.right() + 1 - eDist);
- } else {
- from = metricsMap.layoutToDeviceY(scaleRect.bottom() + 1 - eDist );
- to = metricsMap.layoutToDeviceY(scaleRect.top() + sDist);
- }
- } else {
- const int margin = d_plot->plotLayout()->canvasMargin(axisId);
- if ( axisId == d_plot->yLeft || axisId == d_plot->yRight ){
- from = metricsMap.layoutToDeviceX(canvasRect.bottom() - margin);
- to = metricsMap.layoutToDeviceX(canvasRect.top() + margin);
- } else {
- from = metricsMap.layoutToDeviceY(canvasRect.left() + margin);
- to = metricsMap.layoutToDeviceY(canvasRect.right() - margin);
- }
- }
- map[axisId].setPaintXInterval(from, to);
- }
-
- // The canvas maps are already scaled.
- QwtPainter::setMetricsMap(painter->device(), painter->device());
- printCanvas(painter, canvasRect, map, pfilter);
- QwtPainter::resetMetricsMap();
-
- d_plot->plotLayout()->invalidate();
-
- // reset all widgets with their original attributes.
- if ( pfilter.options() & QwtPlotPrintFilter::PrintFrameWithScales ){
- // restore the previous base line dists
- for (axisId = 0; axisId < QwtPlot::axisCnt; axisId++ ){
- QwtScaleWidget *scaleWidget = (QwtScaleWidget *)d_plot->axisWidget(axisId);
- if ( scaleWidget )
- scaleWidget->setMargin(baseLineDists[axisId]);
- }
- }
-
- pfilter.reset(d_plot);
- painter->restore();
- d_plot->setTitle(t);//hack used to avoid bug in Qwt::printTitle(): the title attributes are overwritten
+ d_plot->print(painter, plotRect, pfilter);
}
void Graph::deselect()
@@ -5647,37 +5453,3 @@
titlePicker->setSelected(false);
}
-void Graph::printCanvas(QPainter *painter, const QRect &canvasRect,
- const QwtScaleMap map[QwtPlot::axisCnt], const QwtPlotPrintFilter &pfilter) const
-{
- painter->save();
-
- QRect rect = canvasRect;
- const QwtPlotCanvas* plotCanvas = d_plot->canvas();
- int lw = plotCanvas->lineWidth();
- int lw2 = lw/2;
- if (lw % 2)
- rect = rect.adjusted(-lw2, -lw2, (lw2 + 1), (lw2 + 1));
- else
- rect = rect.adjusted(-lw2, -lw2, lw2, lw2);
-
- QRect fillRect = rect.adjusted(1, 1, -2, -2);
- QwtPainter::fillRect(painter, fillRect, d_plot->canvasBackground());
-
- painter->setClipping(true);
- painter->setClipRect(fillRect);
- d_plot->drawItems(painter, fillRect, map, pfilter);
- painter->restore();
-
- painter->save();
- if(lw > 0)
- {
- QColor color = plotCanvas->palette().color(QPalette::Active, QColorGroup::Foreground);
- painter->setPen (QPen(color, lw, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin));
- painter->drawRect(rect.adjusted(0, 0, -2, -2));
- }
-
- painter->restore();
-
-}
-
Modified: branches/development/scidavis/src/Graph.h
===================================================================
--- branches/development/scidavis/src/Graph.h 2014-08-26 23:50:25 UTC (rev 1450)
+++ branches/development/scidavis/src/Graph.h 2014-09-16 17:58:55 UTC (rev 1451)
@@ -143,7 +143,9 @@
Grid *grid(){return d_plot->grid();};
- public slots:
+ void exportPainter(QPaintDevice &paintDevice, bool keepAspect = false, QRect rect = QRect());
+ void exportPainter(QPainter &painter, bool keepAspect = false, QRect rect = QRect(), QSize size = QSize());
+public slots:
//! Accessor method for #d_plot.
Plot* plotWidget() const {return d_plot;};
void copy(ApplicationWindow *parent, Graph* g);
@@ -230,14 +232,13 @@
void printCropmarks(bool on){d_print_cropmarks = on;};
void copyImage();
- QPixmap graphPixmap();
//! Provided for convenience in scripts
void exportToFile(const QString& fileName);
void exportSVG(const QString& fname);
void exportVector(const QString& fileName, int res = 0, bool color = true,
bool keepAspect = true, QPrinter::PageSize pageSize = QPrinter::Custom,
QPrinter::Orientation orientation = QPrinter::Portrait);
- void exportImage(const QString& fileName, int quality = 100, bool transparent = false);
+ void exportImage(const QString& fileName, int quality = -1);
//@}
void replot(){d_plot->replot();};
@@ -687,10 +688,7 @@
void setAntialiasing(bool on = true, bool update = true);
void deselect();
- void print(QPainter *, const QRect &rect, const QwtPlotPrintFilter & = QwtPlotPrintFilter());
- void printCanvas(QPainter *painter, const QRect &canvasRect,
- const QwtScaleMap map[QwtPlot::axisCnt], const QwtPlotPrintFilter &pfilter) const;
-
+ void print(QPainter *, const QRect &rect, const QwtPlotPrintFilter &pfilter = QwtPlotPrintFilter());
signals:
void selectedGraph (Graph*);
void closedGraph();
Modified: branches/development/scidavis/src/ImageExportDialog.cpp
===================================================================
--- branches/development/scidavis/src/ImageExportDialog.cpp 2014-08-26 23:50:25 UTC (rev 1450)
+++ branches/development/scidavis/src/ImageExportDialog.cpp 2014-09-16 17:58:55 UTC (rev 1451)
@@ -93,6 +93,7 @@
d_resolution->setRange(0, 1000);
d_resolution->setValue(app->d_export_resolution);
vector_layout->addWidget(d_resolution, 1, 1);
+ d_resolution->setEnabled(false); // FIXME temporary disabled
d_color = new QCheckBox();
d_color->setText(tr("Export in &color"));
@@ -146,9 +147,11 @@
d_box_page_orientation->addItem(tr("Portrait","page orientation"), QVariant(QPrinter::Portrait));
d_box_page_orientation->addItem(tr("Landscape","page orientation"), QVariant(QPrinter::Landscape));
d_box_page_orientation->setCurrentIndex(app->d_export_orientation);
+ d_box_page_orientation->setEnabled(app->d_export_vector_size != QPrinter::Custom);
vector_layout->addWidget(d_box_page_orientation, 5, 1, 1, 2);
connect(d_standard_page, SIGNAL(toggled(bool)), d_box_page_size, SLOT(setEnabled(bool)));
+ connect(d_standard_page, SIGNAL(toggled(bool)), d_box_page_orientation, SLOT(setEnabled(bool)));
d_keep_aspect = new QCheckBox();
d_keep_aspect->setText(tr("&Keep aspect ratio"));
@@ -164,11 +167,6 @@
d_quality->setRange(1, 100);
d_quality->setValue(app->d_export_quality);
raster_layout->addWidget(d_quality, 1, 1);
-
- d_transparency = new QCheckBox();
- d_transparency->setText(tr("Save transparency"));
- d_transparency->setChecked(app->d_export_transparency);
- raster_layout->addWidget(d_transparency, 2, 0, 1, 2);
}
void ImageExportDialog::updateAdvancedOptions (const QString & filter)
@@ -183,7 +181,6 @@
d_advanced_options->setCurrentIndex(0);
else {
d_advanced_options->setCurrentIndex(1);
- d_transparency->setEnabled(filter.contains("*.tif") || filter.contains("*.tiff") || filter.contains("*.png") || filter.contains("*.xpm"));
}
}
@@ -193,7 +190,6 @@
if (app){
app->d_extended_export_dialog = this->isExtended();
app->d_image_export_filter = this->selectedFilter();
- app->d_export_transparency = d_transparency->isChecked();
app->d_export_quality = d_quality->value();
app->d_export_resolution = d_resolution->value();
Modified: branches/development/scidavis/src/ImageExportDialog.h
===================================================================
--- branches/development/scidavis/src/ImageExportDialog.h 2014-08-26 23:50:25 UTC (rev 1450)
+++ branches/development/scidavis/src/ImageExportDialog.h 2014-09-16 17:58:55 UTC (rev 1451)
@@ -65,7 +65,6 @@
//! Container widget for all options available for raster formats.
QGroupBox *d_raster_options;
QSpinBox *d_quality;
- QCheckBox *d_transparency;
public:
//! Constructor
@@ -89,8 +88,6 @@
void setOrientation(QPrinter::Orientation orientation);
//! Return the quality (in percent) the user selected for export to raster formats.
int quality() const { return d_quality->value(); }
- //! Return whether the output's background should be transparent.
- bool transparency() const { return d_transparency->isChecked(); }
void selectFilter(const QString & filter);
Modified: branches/development/scidavis/src/MultiLayer.cpp
===================================================================
--- branches/development/scidavis/src/MultiLayer.cpp 2014-08-26 23:50:25 UTC (rev 1450)
+++ branches/development/scidavis/src/MultiLayer.cpp 2014-09-16 17:58:55 UTC (rev 1451)
@@ -627,11 +627,6 @@
rows=r;
}
-QPixmap MultiLayer::canvasPixmap()
-{
- return QPixmap::grabWidget(canvas);
-}
-
void MultiLayer::exportToFile(const QString& fileName)
{
if ( fileName.isEmpty() ){
@@ -657,34 +652,11 @@
}
}
-void MultiLayer::exportImage(const QString& fileName, int quality, bool transparent)
+void MultiLayer::exportImage(const QString& fileName, int quality)
{
- QPixmap pic = canvasPixmap();
- if (transparent)
- {
- QBitmap mask(pic.size());
- mask.fill(Qt::color1);
- QPainter p;
- p.begin(&mask);
- p.setPen(Qt::color0);
-
- QColor background = QColor (Qt::white);
- QRgb backgroundPixel = background.rgb ();
-
- QImage image = pic.convertToImage();
- for (int y=0; y<image.height(); y++)
- {
- for ( int x=0; x<image.width(); x++ )
- {
- QRgb rgb = image.pixel(x, y);
- if (rgb == backgroundPixel) // we want the frame transparent
- p.drawPoint( x, y );
- }
- }
- p.end();
- pic.setMask(mask);
- }
- pic.save(fileName, 0, quality);
+ QImage image(canvas->size(), QImage::Format_ARGB32);
+ exportPainter(image);
+ image.save(fileName, 0, quality);
}
void MultiLayer::exportPDF(const QString& fname)
@@ -708,104 +680,77 @@
if (fileName.contains(".eps"))
printer.setOutputFormat(QPrinter::PostScriptFormat);
-#ifdef Q_OS_MAC
- if (fileName.contains(".pdf")) // use native Mac OS X print engine
- printer.setOutputFormat(QPrinter::NativeFormat);
-#endif
if (color)
printer.setColorMode(QPrinter::Color);
else
printer.setColorMode(QPrinter::GrayScale);
- if (res)
- printer.setResolution(res);
-
- QRect canvasRect = canvas->rect();
- printer.setOrientation(orientation);
if (pageSize == QPrinter::Custom)
- printer.setPageSize(Graph::minPageSize(printer, canvasRect));
+ printer.setPaperSize(canvas->size(), QPrinter::Point);
else
- printer.setPageSize(pageSize);
+ {
+ printer.setOrientation(orientation);
+ printer.setPaperSize(pageSize);
+ }
- double canvas_aspect = double(canvasRect.width())/double(canvasRect.height());
-
- int x_margin, y_margin, width, height;
- if (keepAspect){// export should preserve plot aspect ratio
- double page_aspect = double(printer.width())/double(printer.height());
- if (page_aspect > canvas_aspect){
- y_margin = (int) ((0.1/2.54)*printer.logicalDpiY()); // 1 mm margins
- height = printer.height() - 2*y_margin;
- width = height*canvas_aspect;
- x_margin = (printer.width()- width)/2;
- } else {
- x_margin = (int) ((0.1/2.54)*printer.logicalDpiX()); // 1 mm margins
- width = printer.width() - 2*x_margin;
- height = width/canvas_aspect;
- y_margin = (printer.height()- height)/2;
- }
- } else {
- x_margin = (int) ((0.1/2.54)*printer.logicalDpiX()); // 1 mm margins
- y_margin = (int) ((0.1/2.54)*printer.logicalDpiY()); // 1 mm margins
- width = printer.width() - 2*x_margin;
- height = printer.height() - 2*y_margin;
- }
-
- double scaleFactorX = (double)(width)/(double)canvasRect.width();
- double scaleFactorY = (double)(height)/(double)canvasRect.height();
-
- QPainter paint(&printer);
- for (int i=0; i<(int)graphsList.count(); i++){
- Graph *gr = (Graph *)graphsList.at(i);
- Plot *myPlot = (Plot *)gr->plotWidget();
-
- QPoint pos = gr->pos();
- pos = QPoint(int(x_margin + pos.x()*scaleFactorX), int(y_margin + pos.y()*scaleFactorY));
-
- int layer_width = int(myPlot->frameGeometry().width()*scaleFactorX);
- int layer_height = int(myPlot->frameGeometry().height()*scaleFactorY);
-
- gr->print(&paint, QRect(pos, QSize(layer_width, layer_height)));
- }
+ exportPainter(printer, keepAspect);
}
void MultiLayer::exportSVG(const QString& fname)
{
- #if QT_VERSION >= 0x040300
+#if QT_VERSION >= 0x040300
QSvgGenerator generator;
generator.setFileName(fname);
+#if QT_VERSION >= 0x040500
generator.setSize(canvas->size());
+ generator.setViewBox(QRect(QPoint(0,0), generator.size()));
+ generator.setResolution(96); // FIXME hardcored
+ generator.setTitle(this->name());
+#endif
+ exportPainter(generator);
+#endif
+}
- QPainter p(&generator);
- for (int i=0; i<(int)graphsList.count(); i++)
- {
- Graph *gr = (Graph *)graphsList.at(i);
- Plot *myPlot = (Plot *)gr->plotWidget();
-
- QPoint pos = QPoint(gr->pos().x(), gr->pos().y());
- gr->print(&p, QRect(pos, myPlot->size()));
- }
- p.end();
- #endif
+void MultiLayer::exportPainter(QPaintDevice& paintDevice, bool keepAspect, QRect rect)
+{
+ QPainter p(&paintDevice);
+ exportPainter(p, keepAspect, rect, QSize(paintDevice.width(), paintDevice.height()));
+ p.end();
}
-void MultiLayer::copyAllLayers()
-{
- bool selectionOn = false;
- if (d_layers_selector)
+void MultiLayer::exportPainter(QPainter &painter, bool keepAspect, QRect rect, QSize size)
+ {
+ if (size == QSize()) size = canvas->size();
+ if (rect == QRect()) rect = canvas->rect();
+ if (keepAspect)
+ {
+ QSize scaled = rect.size();
+ scaled.scale(size, Qt::KeepAspectRatio);
+ size = scaled;
+ }
+ painter.scale(
+ (double)size.width()/(double)rect.width(),
+ (double)size.height()/(double)rect.height()
+ );
+
+ painter.fillRect(rect, backgroundBrush()); // FIXME workaround for background
+
+ for (int i=0; i<(int)graphsList.count(); i++)
{
- d_layers_selector->hide();
- selectionOn = true;
+ Graph *gr = (Graph *)graphsList.at(i);
+ Plot *myPlot = (Plot *)gr->plotWidget();
+
+ QPoint pos = QPoint(gr->pos().x(), gr->pos().y());
+ gr->exportPainter(painter, false, QRect(pos, myPlot->size()));
}
+ }
- foreach (QWidget* g, graphsList)
- ((Graph *)g)->deselectMarker();
- QPixmap pic = canvasPixmap();
- QImage image= pic.convertToImage();
+void MultiLayer::copyAllLayers()
+{
+ QImage image(canvas->size(), QImage::Format_ARGB32);
+ exportPainter(image);
QApplication::clipboard()->setImage(image);
-
- if (selectionOn)
- d_layers_selector->show();
}
void MultiLayer::printActiveLayer()
Modified: branches/development/scidavis/src/MultiLayer.h
===================================================================
--- branches/development/scidavis/src/MultiLayer.h 2014-08-26 23:50:25 UTC (rev 1450)
+++ branches/development/scidavis/src/MultiLayer.h 2014-09-16 17:58:55 UTC (rev 1451)
@@ -160,14 +160,15 @@
//! \name Print and Export
//@{
- QPixmap canvasPixmap();
void exportToFile(const QString& fileName);
- void exportImage(const QString& fileName, int quality = 100, bool transparent = false);
+ void exportImage(const QString& fileName, int quality = -1);
void exportSVG(const QString& fname);
void exportPDF(const QString& fname);
void exportVector(const QString& fileName, int res = 0, bool color = true,
bool keepAspect = true, QPrinter::PageSize pageSize = QPrinter::Custom,
QPrinter::Orientation orientation = QPrinter::Portrait);
+ void exportPainter(QPaintDevice &paintDevice, bool keepAspect = false, QRect rect = QRect());
+ void exportPainter(QPainter &painter, bool keepAspect = false, QRect rect = QRect(), QSize size = QSize());
void copyAllLayers();
void print();
Modified: branches/development/scidavis/src/Plot.cpp
===================================================================
--- branches/development/scidavis/src/Plot.cpp 2014-08-26 23:50:25 UTC (rev 1450)
+++ branches/development/scidavis/src/Plot.cpp 2014-09-16 17:58:55 UTC (rev 1451)
@@ -151,37 +151,6 @@
painter->restore();
}
-
-void Plot::printCanvas(QPainter *painter, const QRect &canvasRect,
- const QwtScaleMap map[axisCnt], const QwtPlotPrintFilter &pfilter) const
-{
- painter->save();
-
- const QwtPlotCanvas* plotCanvas=canvas();
- QRect rect = canvasRect;
- rect.addCoords(1, 0, -1, -1);
- QwtPainter::fillRect(painter, rect, canvasBackground());
-
- painter->setClipping(true);
- QwtPainter::setClipRect(painter, rect);
-
- drawItems(painter, canvasRect, map, pfilter);
- painter->restore();
-
- painter->save();
- if(plotCanvas->lineWidth() > 0)
- {
- QColor color = plotCanvas->palette().color(QPalette::Active, QColorGroup::Foreground);
- painter->setPen (QPen(color, plotCanvas->lineWidth(),
- Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin));
-
- int lw = plotCanvas->lineWidth()/2;
- rect.addCoords(-lw, -lw, plotCanvas->lineWidth(), plotCanvas->lineWidth());
- QwtPainter::drawRect(painter, rect);
- }
- painter->restore();
-}
-
void Plot::drawItems (QPainter *painter, const QRect &rect,
const QwtScaleMap map[axisCnt], const QwtPlotPrintFilter &pfilter) const
{
@@ -640,42 +609,6 @@
}
}
-/*!
- \brief Adjust plot content to its current size.
- Must be reimplemented because the base implementation adds a mask causing an ugly drawing artefact.
-*/
-void Plot::updateLayout()
-{
- plotLayout()->activate(this, contentsRect());
-
- //
- // resize and show the visible widgets
- //
- if (!titleLabel()->text().isEmpty())
- {
- titleLabel()->setGeometry(plotLayout()->titleRect());
- if (!titleLabel()->isVisible())
- titleLabel()->show();
- }
- else
- titleLabel()->hide();
-
- for (int axisId = 0; axisId < axisCnt; axisId++ )
- {
- if (axisEnabled(axisId) )
- {
- axisWidget(axisId)->setGeometry(plotLayout()->scaleRect(axisId));
- if (!axisWidget(axisId)->isVisible())
- axisWidget(axisId)->show();
- }
- else
- axisWidget(axisId)->hide();
- }
-
- canvas()->setGeometry(plotLayout()->canvasRect());
-}
-
-
const QColor & Plot::paletteBackgroundColor() const
{
return palette().color(QPalette::Window);
Modified: branches/development/scidavis/src/Plot.h
===================================================================
--- branches/development/scidavis/src/Plot.h 2014-08-26 23:50:25 UTC (rev 1450)
+++ branches/development/scidavis/src/Plot.h 2014-09-16 17:58:55 UTC (rev 1451)
@@ -92,13 +92,8 @@
QColor frameColor();
const QColor & paletteBackgroundColor() const;
- void print(QPainter *, const QRect &rect, const QwtPlotPrintFilter & = QwtPlotPrintFilter());
- void updateLayout();
-
+ void print(QPainter *, const QRect &rect, const QwtPlotPrintFilter & = QwtPlotPrintFilter());
protected:
- void printCanvas(QPainter *painter, const QRect &canvasRect,
- const QwtScaleMap map[axisCnt], const QwtPlotPrintFilter &pfilter) const;
-
virtual void drawItems (QPainter *painter, const QRect &rect,
const QwtScaleMap map[axisCnt], const QwtPlotPrintFilter &pfilter) const;
Modified: branches/development/scidavis/src/scidavis.sip
===================================================================
--- branches/development/scidavis/src/scidavis.sip 2014-08-26 23:50:25 UTC (rev 1450)
+++ branches/development/scidavis/src/scidavis.sip 2014-09-16 17:58:55 UTC (rev 1451)
@@ -1000,7 +1000,7 @@
void replot();
void print() /PyName=printDialog/;
- void exportImage(const QString& fileName, int quality = 100, bool transparent = false);
+ void exportImage(const QString& fileName, int quality = -1);
void exportVector(const QString& fileName, int res = 0, bool color = true,
bool keepAspect = true, QPrinter::PageSize pageSize = QPrinter::Custom);
void exportToFile(const QString& fileName) /PyName=export/;
@@ -1065,7 +1065,7 @@
void arrangeLayers(bool fit, bool user_size);
void exportToFile(const QString& fileName) /PyName=export/;
- void exportImage(const QString& fileName, int quality = 100, bool transparent = false);
+ void exportImage(const QString& fileName, int quality = -1);
void exportVector(const QString& fileName, int res = 0, bool color = true,
bool keepAspect = true, QPrinter::PageSize pageSize = QPrinter::Custom);
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-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.
|
