rpms/3Depict
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Fix broken patch

Browse source
This commit is contained in:
mycae 2016-08-03 22:35:36 -04:00
commit b149a69eb3
1 changed files with 41 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

90
3Depict-0.0.19-upstream-effd078610a7.patch
View file

@ -1,14 +1,6 @@
diff -r bcb9acfa66de -r effd078610a7 .hgtags
--- a/.hgtags Tue May 31 13:04:58 2016 +1000
+++ b/.hgtags Tue Jun 21 12:45:20 2016 +0100
@@ -16,3 +16,4 @@
9fcee7d53bc2a2b69db9dbe59c6f1264615a54e4 3Depict-0.0.16
19a65d51c5d65ebf3d8b7760cfa4edde36c251c0 3Depict-0.0.17
910618ab1f369c5a9253965e12f5d8f75fceb0c6 3Depict-0.0.18
+bcb9acfa66de56f6531016d1e81a68d7118b7b35 3Depict-0.0.19
diff -r bcb9acfa66de -r effd078610a7 docs/manual-latex/build-latex.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/manual-latex/build-latex.sh Tue Jun 21 12:45:20 2016 +0100
+++ docs/manual-latex/build-latex.sh Tue Jun 21 12:45:20 2016 +0100
@@ -0,0 +1,37 @@
+#!/bin/bash
+LATEXBIN=pdflatex
@ -48,8 +40,8 @@ diff -r bcb9acfa66de -r effd078610a7 docs/manual-latex/build-latex.sh
+fi
+
diff -r bcb9acfa66de -r effd078610a7 src/backend/filter.cpp
--- a/src/backend/filter.cpp Tue May 31 13:04:58 2016 +1000
+++ b/src/backend/filter.cpp Tue Jun 21 12:45:20 2016 +0100
--- src/backend/filter.cpp Tue May 31 13:04:58 2016 +1000
+++ src/backend/filter.cpp Tue Jun 21 12:45:20 2016 +0100
@@ -553,7 +553,7 @@
ASSERT(scatterIntensity.empty());
@ -60,8 +52,8 @@ diff -r bcb9acfa66de -r effd078610a7 src/backend/filter.cpp
void RangeStreamData::checkSelfConsistent() const
{
diff -r bcb9acfa66de -r effd078610a7 src/backend/filter.h
--- a/src/backend/filter.h Tue May 31 13:04:58 2016 +1000
+++ b/src/backend/filter.h Tue Jun 21 12:45:20 2016 +0100
--- src/backend/filter.h Tue May 31 13:04:58 2016 +1000
+++ src/backend/filter.h Tue Jun 21 12:45:20 2016 +0100
@@ -395,7 +395,7 @@
//Label for X, Y axes
std::string xLabel,yLabel;
@ -72,8 +64,8 @@ diff -r bcb9acfa66de -r effd078610a7 src/backend/filter.h
//!Structured XY data pairs for plotting curve
Array2D<float> xyData;
diff -r bcb9acfa66de -r effd078610a7 src/backend/filters/algorithms/rdf.cpp
--- a/src/backend/filters/algorithms/rdf.cpp Tue May 31 13:04:58 2016 +1000
+++ b/src/backend/filters/algorithms/rdf.cpp Tue Jun 21 12:45:20 2016 +0100
--- src/backend/filters/algorithms/rdf.cpp Tue May 31 13:04:58 2016 +1000
+++ src/backend/filters/algorithms/rdf.cpp Tue Jun 21 12:45:20 2016 +0100
@@ -862,6 +862,8 @@
return RDF_ABORT_FAIL;
#endif
@ -93,8 +85,8 @@ diff -r bcb9acfa66de -r effd078610a7 src/backend/filters/algorithms/rdf.cpp
}
diff -r bcb9acfa66de -r effd078610a7 src/backend/filters/annotation.cpp
--- a/src/backend/filters/annotation.cpp Tue May 31 13:04:58 2016 +1000
+++ b/src/backend/filters/annotation.cpp Tue Jun 21 12:45:20 2016 +0100
--- src/backend/filters/annotation.cpp Tue May 31 13:04:58 2016 +1000
+++ src/backend/filters/annotation.cpp Tue Jun 21 12:45:20 2016 +0100
@@ -167,8 +167,15 @@
//If we are not enabled, do not draw anything into the output
@ -120,8 +112,8 @@ diff -r bcb9acfa66de -r effd078610a7 src/backend/filters/annotation.cpp
}
diff -r bcb9acfa66de -r effd078610a7 src/backend/filters/boundingBox.cpp
--- a/src/backend/filters/boundingBox.cpp Tue May 31 13:04:58 2016 +1000
+++ b/src/backend/filters/boundingBox.cpp Tue Jun 21 12:45:20 2016 +0100
--- src/backend/filters/boundingBox.cpp Tue May 31 13:04:58 2016 +1000
+++ src/backend/filters/boundingBox.cpp Tue Jun 21 12:45:20 2016 +0100
@@ -510,7 +510,6 @@
}
#endif
@ -139,8 +131,8 @@ diff -r bcb9acfa66de -r effd078610a7 src/backend/filters/boundingBox.cpp
if(bTotal.isValid())
{
diff -r bcb9acfa66de -r effd078610a7 src/backend/filters/clusterAnalysis.cpp
--- a/src/backend/filters/clusterAnalysis.cpp Tue May 31 13:04:58 2016 +1000
+++ b/src/backend/filters/clusterAnalysis.cpp Tue Jun 21 12:45:20 2016 +0100
--- src/backend/filters/clusterAnalysis.cpp Tue May 31 13:04:58 2016 +1000
+++ src/backend/filters/clusterAnalysis.cpp Tue Jun 21 12:45:20 2016 +0100
@@ -685,7 +685,7 @@
Plot2DStreamData *p = new Plot2DStreamData;
p->parent=this;
@ -151,8 +143,8 @@ diff -r bcb9acfa66de -r effd078610a7 src/backend/filters/clusterAnalysis.cpp
p->xLabel=TRANS("\\lambda_1:\\lambda_2 ratio");
p->yLabel=TRANS("\\lambda_2:\\lambda_3 ratio");
diff -r bcb9acfa66de -r effd078610a7 src/backend/filters/ionColour.cpp
--- a/src/backend/filters/ionColour.cpp Tue May 31 13:04:58 2016 +1000
+++ b/src/backend/filters/ionColour.cpp Tue Jun 21 12:45:20 2016 +0100
--- src/backend/filters/ionColour.cpp Tue May 31 13:04:58 2016 +1000
+++ src/backend/filters/ionColour.cpp Tue Jun 21 12:45:20 2016 +0100
@@ -271,12 +271,14 @@
@ -169,8 +161,8 @@ diff -r bcb9acfa66de -r effd078610a7 src/backend/filters/ionColour.cpp
stream_cast(p.data,alpha);
p.type=PROPERTY_TYPE_REAL;
diff -r bcb9acfa66de -r effd078610a7 src/backend/filters/ionDownsample.cpp
--- a/src/backend/filters/ionDownsample.cpp Tue May 31 13:04:58 2016 +1000
+++ b/src/backend/filters/ionDownsample.cpp Tue Jun 21 12:45:20 2016 +0100
--- src/backend/filters/ionDownsample.cpp Tue May 31 13:04:58 2016 +1000
+++ src/backend/filters/ionDownsample.cpp Tue Jun 21 12:45:20 2016 +0100
@@ -88,7 +88,7 @@
rsdIncoming = new RangeStreamData;
*rsdIncoming=*c;
@ -191,8 +183,8 @@ diff -r bcb9acfa66de -r effd078610a7 src/backend/filters/ionDownsample.cpp
unsigned int typeVal;
if(fixedNumOut)
diff -r bcb9acfa66de -r effd078610a7 src/backend/filters/ionInfo.cpp
--- a/src/backend/filters/ionInfo.cpp Tue May 31 13:04:58 2016 +1000
+++ b/src/backend/filters/ionInfo.cpp Tue Jun 21 12:45:20 2016 +0100
--- src/backend/filters/ionInfo.cpp Tue May 31 13:04:58 2016 +1000
+++ src/backend/filters/ionInfo.cpp Tue Jun 21 12:45:20 2016 +0100
@@ -398,7 +398,7 @@
@ -213,8 +205,8 @@ diff -r bcb9acfa66de -r effd078610a7 src/backend/filters/ionInfo.cpp
}
diff -r bcb9acfa66de -r effd078610a7 src/backend/filters/spatialAnalysis.cpp
--- a/src/backend/filters/spatialAnalysis.cpp Tue May 31 13:04:58 2016 +1000
+++ b/src/backend/filters/spatialAnalysis.cpp Tue Jun 21 12:45:20 2016 +0100
--- src/backend/filters/spatialAnalysis.cpp Tue May 31 13:04:58 2016 +1000
+++ src/backend/filters/spatialAnalysis.cpp Tue Jun 21 12:45:20 2016 +0100
@@ -655,115 +655,180 @@
return ERR_FILE_READ_FAIL;
@ -821,8 +813,8 @@ diff -r bcb9acfa66de -r effd078610a7 src/backend/filters/spatialAnalysis.cpp
const IonStreamData *createLCIonStream()
{
diff -r bcb9acfa66de -r effd078610a7 src/backend/filters/spectrumPlot.cpp
--- a/src/backend/filters/spectrumPlot.cpp Tue May 31 13:04:58 2016 +1000
+++ b/src/backend/filters/spectrumPlot.cpp Tue Jun 21 12:45:20 2016 +0100
--- src/backend/filters/spectrumPlot.cpp Tue May 31 13:04:58 2016 +1000
+++ src/backend/filters/spectrumPlot.cpp Tue Jun 21 12:45:20 2016 +0100
@@ -517,6 +517,8 @@
getOut.push_back(d);
@ -833,8 +825,8 @@ diff -r bcb9acfa66de -r effd078610a7 src/backend/filters/spectrumPlot.cpp
}
diff -r bcb9acfa66de -r effd078610a7 src/backend/filters/transform.cpp
--- a/src/backend/filters/transform.cpp Tue May 31 13:04:58 2016 +1000
+++ b/src/backend/filters/transform.cpp Tue Jun 21 12:45:20 2016 +0100
--- src/backend/filters/transform.cpp Tue May 31 13:04:58 2016 +1000
+++ src/backend/filters/transform.cpp Tue Jun 21 12:45:20 2016 +0100
@@ -998,8 +998,10 @@
break;
}
@ -870,8 +862,8 @@ diff -r bcb9acfa66de -r effd078610a7 src/backend/filters/transform.cpp
return false;
break;
diff -r bcb9acfa66de -r effd078610a7 src/backend/plot.cpp
--- a/src/backend/plot.cpp Tue May 31 13:04:58 2016 +1000
+++ b/src/backend/plot.cpp Tue Jun 21 12:45:20 2016 +0100
--- src/backend/plot.cpp Tue May 31 13:04:58 2016 +1000
+++ src/backend/plot.cpp Tue Jun 21 12:45:20 2016 +0100
@@ -29,7 +29,7 @@
NTRANS("Moving avg.")
};
@ -1023,8 +1015,8 @@ diff -r bcb9acfa66de -r effd078610a7 src/backend/plot.cpp
}
diff -r bcb9acfa66de -r effd078610a7 src/backend/plot.h
--- a/src/backend/plot.h Tue May 31 13:04:58 2016 +1000
+++ b/src/backend/plot.h Tue Jun 21 12:45:20 2016 +0100
--- src/backend/plot.h Tue May 31 13:04:58 2016 +1000
+++ src/backend/plot.h Tue Jun 21 12:45:20 2016 +0100
@@ -217,7 +217,7 @@
class PlotBase
{
@ -1077,8 +1069,8 @@ diff -r bcb9acfa66de -r effd078610a7 src/backend/plot.h
//Retrieve the types of visible plots
unsigned int getVisibleMode() const;
diff -r bcb9acfa66de -r effd078610a7 src/backend/viscontrol.cpp
--- a/src/backend/viscontrol.cpp Tue May 31 13:04:58 2016 +1000
+++ b/src/backend/viscontrol.cpp Tue Jun 21 12:45:20 2016 +0100
--- src/backend/viscontrol.cpp Tue May 31 13:04:58 2016 +1000
+++ src/backend/viscontrol.cpp Tue Jun 21 12:45:20 2016 +0100
@@ -249,7 +249,7 @@
plotData->yLabel,plotData->dataLabel);
@ -1098,8 +1090,8 @@ diff -r bcb9acfa66de -r effd078610a7 src/backend/viscontrol.cpp
case PLOT_2D_DENS:
{
diff -r bcb9acfa66de -r effd078610a7 src/common/basics.cpp
--- a/src/common/basics.cpp Tue May 31 13:04:58 2016 +1000
+++ b/src/common/basics.cpp Tue Jun 21 12:45:20 2016 +0100
--- src/common/basics.cpp Tue May 31 13:04:58 2016 +1000
+++ src/common/basics.cpp Tue Jun 21 12:45:20 2016 +0100
@@ -1347,7 +1347,8 @@
while(CFile.good() && !CFile.eof() && atHeader)
{
@ -1124,8 +1116,8 @@ diff -r bcb9acfa66de -r effd078610a7 src/common/basics.cpp
return 0;
diff -r bcb9acfa66de -r effd078610a7 src/gui/mainFrame.cpp
--- a/src/gui/mainFrame.cpp Tue May 31 13:04:58 2016 +1000
+++ b/src/gui/mainFrame.cpp Tue Jun 21 12:45:20 2016 +0100
--- src/gui/mainFrame.cpp Tue May 31 13:04:58 2016 +1000
+++ src/gui/mainFrame.cpp Tue Jun 21 12:45:20 2016 +0100
@@ -1391,7 +1391,7 @@
updateWxTreeCtrl(treeFilters);
@ -1179,8 +1171,8 @@ diff -r bcb9acfa66de -r effd078610a7 src/gui/mainFrame.cpp
consoleMessages=refreshControl->getConsoleMessages();
diff -r bcb9acfa66de -r effd078610a7 src/gui/mainFrame.h
--- a/src/gui/mainFrame.h Tue May 31 13:04:58 2016 +1000
+++ b/src/gui/mainFrame.h Tue Jun 21 12:45:20 2016 +0100
--- src/gui/mainFrame.h Tue May 31 13:04:58 2016 +1000
+++ src/gui/mainFrame.h Tue Jun 21 12:45:20 2016 +0100
@@ -124,7 +124,7 @@
//!Update the progress information in the status bar
void updateProgressStatus();
@ -1191,8 +1183,8 @@ diff -r bcb9acfa66de -r effd078610a7 src/gui/mainFrame.h
//!Complete the scene update. Returns false if failed
void finishSceneUpdate(unsigned int errCode);
diff -r bcb9acfa66de -r effd078610a7 src/gui/mathglPane.cpp
--- a/src/gui/mathglPane.cpp Tue May 31 13:04:58 2016 +1000
+++ b/src/gui/mathglPane.cpp Tue Jun 21 12:45:20 2016 +0100
--- src/gui/mathglPane.cpp Tue May 31 13:04:58 2016 +1000
+++ src/gui/mathglPane.cpp Tue Jun 21 12:45:20 2016 +0100
@@ -627,7 +627,7 @@
thePlot->getRegion(plotId,regionId,r);
@ -1221,8 +1213,8 @@ diff -r bcb9acfa66de -r effd078610a7 src/gui/mathglPane.cpp
//Draw "ghost" limits markers for move,
//these appear as moving vertical bars to outline
diff -r bcb9acfa66de -r effd078610a7 src/wx/wxcomponents.cpp
--- a/src/wx/wxcomponents.cpp Tue May 31 13:04:58 2016 +1000
+++ b/src/wx/wxcomponents.cpp Tue Jun 21 12:45:20 2016 +0100
--- src/wx/wxcomponents.cpp Tue May 31 13:04:58 2016 +1000
+++ src/wx/wxcomponents.cpp Tue Jun 21 12:45:20 2016 +0100
@@ -188,14 +188,14 @@
void CopyGrid::saveData()