diff --git a/3Depict-0.0.6-font-path.patch b/3Depict-0.0.6-font-path.patch deleted file mode 100644 index 33b4705..0000000 --- a/3Depict-0.0.6-font-path.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -r dfc04b8b14b2 src/wxcomponents.cpp ---- src/wxcomponents.cpp Fri May 20 22:26:38 2011 +0100 -+++ src/wxcomponents.cpp Fri May 20 22:27:00 2011 +0100 -@@ -660,6 +660,7 @@ - //This is a list of possible target dirs to search - //(Oh look Ma, I'm autoconf!) - const char *dirs[] = { ".", -+ "/usr/share/fonts/dejavu", //Fedora - "/usr/share/fonts/truetype", - "/usr/local/share/fonts/truetype", - "/usr/X11R6/lib/X11/fonts/truetype", diff --git a/3Depict-0.0.6-manual-pdf-loc.patch b/3Depict-0.0.6-manual-pdf-loc.patch deleted file mode 100644 index 5d338be..0000000 --- a/3Depict-0.0.6-manual-pdf-loc.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -r dd964e5b7415 src/3Depict.cpp ---- src/3Depict.cpp Sun Mar 27 18:36:46 2011 +0100 -+++ src/3Depict.cpp Sun Mar 27 18:38:13 2011 +0100 -@@ -1894,9 +1894,9 @@ - string s; - s=locateDataFile("3Depict-manual.pdf"); - -- //Also debian makes us use the lowercase "D", so check there too. -- if(!s.size()) -- s=locateDataFile("3depict-manual.pdf"); -+ //Also Fedora has diff dir -+ if(!wxFileExists(wxStr(s))) -+ s="/usr/share/doc/3Depict-0.0.5/3Depict-0.0.5-manual.pdf"; - - - //If we found it, use the default program associated with that data file diff --git a/3Depict-0.0.8-font-path.patch b/3Depict-0.0.8-font-path.patch new file mode 100644 index 0000000..70252ee --- /dev/null +++ b/3Depict-0.0.8-font-path.patch @@ -0,0 +1,11 @@ +diff -r dfc04b8b14b2 src/wxcomponents.cpp +--- src/wxcomponents.cpp Fri May 20 22:26:38 2011 +0100 ++++ src/wxcomponents.cpp Fri May 20 22:27:00 2011 +0100 +@@ -666,6 +666,7 @@ + //This is a list of possible target dirs to search + //(Oh look Ma, I'm autoconf!) + const char *dirs[] = { ".", ++ "/usr/share/fonts/dejavu", //Fedora + "/usr/share/fonts/truetype", + "/usr/local/share/fonts/truetype", + "/usr/X11R6/lib/X11/fonts/truetype", diff --git a/3Depict-0.0.8-manual-latex.patch b/3Depict-0.0.8-manual-latex.patch new file mode 100644 index 0000000..423bfb2 --- /dev/null +++ b/3Depict-0.0.8-manual-latex.patch @@ -0,0 +1,28 @@ +Index: 3depict-0.0.8/docs/manual-latex/manual.tex +=================================================================== +--- docs/manual-latex/manual.tex 2011-10-23 16:57:40.000000000 +0100 ++++ docs/manual-latex/manual.tex 2011-10-23 16:57:59.000000000 +0100 +@@ -40,7 +40,7 @@ + \begin{minipage}{0.3\textwidth} + \begin{flushright} \large + \emph{Version:} \\ +- 0.0.7, Jul 2011\end{flushright} ++ 0.0.8, Oct 2011\end{flushright} + \end{minipage} + + \vfill +@@ -499,12 +499,13 @@ + \item \textbf{Reflexive} If selected, the reflexive (exterior) angle will be displayed, rather than the interior angle for the angular measurement. + \item \textbf{Show Angle} Will display the angle measured by the marker in the 3D scene, if selected. + \item \textbf{Text Size} Controls the text size for the angle measurement, if the angle is shown. +-\item \textbf{Digit format} Controls the number of significant digits to use, such as '##.##', which will show (for example), 10.78 as the degree value. Use #, or 0-9 as placeholders to specify the format.Allowable decimal separators are period (.) and comma (,). ++\item \textbf{Digit format} Controls the number of significant digits to use, such as '\#\#.\#\#', which will show (for example), 10.78 as the degree value. Use \#, or 0-9 as placeholders to specify the format.Allowable decimal separators are period (.) and comma (,). + + \item \textbf{Sphere size} Sets the size of the sphere widgets which are used to maniupulate and draw the angular measurement positions. + \end{itemize} + \section{Attributions} + ++\begin{itemize} + \item The source code image is a derivative work of \url{http://commons.wikimedia.org/wiki/File:User_icon_2.svg} and \url{http://commons.wikimedia.org/wiki/C_cplusplus_compilation_process.svg}. + + \item The camera image is a derivative work of \url{http://commons.wikimedia.org/wiki/File:Icon_Camera.svg}. diff --git a/3Depict-0.0.8-manual-pdf-loc.patch b/3Depict-0.0.8-manual-pdf-loc.patch new file mode 100644 index 0000000..a819a9c --- /dev/null +++ b/3Depict-0.0.8-manual-pdf-loc.patch @@ -0,0 +1,16 @@ +diff -r 634db475333f src/3Depict.cpp +--- src/3Depict.cpp Sun Oct 23 17:43:37 2011 +0100 ++++ src/3Depict.cpp Sun Oct 23 17:44:33 2011 +0100 +@@ -2142,9 +2142,9 @@ + string s; + s=locateDataFile("3Depict-manual.pdf"); + +- //Also Debian makes us use the lowercase "D", so check there too. +- if(!s.size()) +- s=locateDataFile("3depict-manual.pdf"); ++ //Also Fedora has diff dir ++ if(!wxFileExists(wxStr(s))) ++ s="/usr/share/doc/3Depict-0.0.8/3Depict-0.0.8-manual.pdf"; + + + //If we found it, use the default program associated with that data file diff --git a/3Depict-blockmask-fix.patch b/3Depict-blockmask-fix.patch deleted file mode 100644 index aa51a93..0000000 --- a/3Depict-blockmask-fix.patch +++ /dev/null @@ -1,30 +0,0 @@ -reverted: ---- src/viscontrol.cpp Fri Aug 12 23:18:47 2011 +0100 -+++ src/viscontrol.cpp Sat Aug 13 01:27:01 2011 +0100 -@@ -670,15 +671,24 @@ - continue; - - -+ //Initially assume that everything is passed through -+ //filter -+ int blockMask=0x0; -+ -- int blockMask=0xFFFF; - - if((*it)->haveCache()) - { - //Loop over the children of this filter, grab their block masks - for(tree::sibling_iterator itJ=it.begin(); itJ!=it.end();itJ++) - { -+ - if((*itJ)->haveCache()) -+ { -+ int curBlockMask; -+ curBlockMask=(*itJ)->getRefreshBlockMask(); -+ blockMask= (blockMask & curBlockMask); -+ -+ } -- blockMask&=(*itJ)->getRefreshBlockMask(); - else - { - blockMask&=0; diff --git a/3Depict-density-fix.patch b/3Depict-density-fix.patch deleted file mode 100644 index 625309f..0000000 --- a/3Depict-density-fix.patch +++ /dev/null @@ -1,47 +0,0 @@ -reverted: ---- src/filters/compositionProfile.cpp Fri Aug 12 20:46:42 2011 +0100 -+++ src/filters/compositionProfile.cpp Fri Aug 12 23:18:47 2011 +0100 -@@ -383,7 +383,7 @@ - - float angle = dir.angle(direction); - -+ float halfLen=sqrt(vectorParams[1].sqrMag()); -- float halfLen=sqrt(vectorParams[1].sqrMag())/2.0f; - float sqrRad=scalarParams[0]*scalarParams[0]; - - //Check that we actually need to rotate, to avoid numerical singularity -@@ -554,6 +554,17 @@ - } - - plotData[ui]->xyData.resize(ionFrequencies[ui].size()); -+ -+ //Density profiles (non-ranged plots) have a fixed normalisation factor -+ if(!rngData && normalise) -+ { -+ if(fixedBins) -+ normFactor = 1.0/(M_PI*scalarParams[0]*scalarParams[0]*(length/(float)numBins)); -+ else -+ normFactor = 1.0/(M_PI*scalarParams[0]*scalarParams[0]*binWidth); -+ } -+ -+ //Go through each bin, then perform the appropriate normalisation - for(unsigned int uj=0;ujxyData[uj] = std::make_pair( - xPos,normFactor*(float)ionFrequencies[ui][uj]); - diff --git a/3Depict-wrong-icon.patch b/3Depict-wrong-icon.patch deleted file mode 100644 index b8cbdb9..0000000 --- a/3Depict-wrong-icon.patch +++ /dev/null @@ -1,1171 +0,0 @@ ---- src/tex-source/3Depict-icon.svg 2011-07-17 21:25:03.000000000 +0100 -+++ 3Depict-icon.svg 2011-08-14 15:53:41.020059833 +0100 -@@ -13,10 +13,10 @@ - inkscape:export-ydpi="60.436714" - inkscape:export-xdpi="60.436714" - sodipodi:docname="3Depict-icon.svg" -- inkscape:version="0.48.0 r9654" -+ inkscape:version="0.47 r22583" - id="svg2" -- height="2626.415" -- width="1263.624" -+ height="190" -+ width="190" - version="1.0"> - -- -- -- -- -- -- -- -+ inkscape:window-maximized="0" -+ inkscape:current-layer="g3233" /> - - -@@ -83,150 +52,12 @@ - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - -@@ -537,6 +368,17 @@ - y1="63" - x2="31.5" - y2="12" /> -+ - -+ -+ -+ -+ -+ -+ - - - -+ - - - -+ - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - -+ transform="translate(-0.30631,-15.087076)"> -+ -+ -+ -+ -+ -+ - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ transform="translate(19.581036,40.120974)" -+ id="g3127"> - -+ d="m 153.13327,95.699138 c 0,29.922732 -24.25717,54.179892 -54.179902,54.179892 -29.922725,0 -54.179889,-24.25716 -54.179889,-54.179892 0,-29.922733 24.257164,-54.179897 54.179889,-54.179897 29.922732,0 54.179902,24.257164 54.179902,54.179897 z" -+ style="fill:url(#radialGradient3258);fill-opacity:1;fill-rule:nonzero;stroke:none" -+ id="path2790-5" /> - -+ id="g3119"> - -- -- -- -- -- -+ id="path1873-5" -+ style="fill:url(#linearGradient3260);fill-opacity:1;fill-rule:nonzero;stroke:#000074;stroke-width:3.75;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" -+ d="m 149.10153,91.66739 c 0,29.92273 -24.25717,54.1799 -54.179902,54.1799 -29.922729,0 -54.179893,-24.25717 -54.179893,-54.1799 0,-29.922729 24.257164,-54.179893 54.179893,-54.179893 29.922732,0 54.179902,24.257164 54.179902,54.179893 z" /> -+ - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- Range -- -- Draw -- -- -- -- -- -- -- -- -- Plot -- Ion - - - diff --git a/3Depict.spec b/3Depict.spec index fcbc7f6..eca9131 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,5 +1,5 @@ Name: 3Depict -Version: 0.0.7 +Version: 0.0.8 Release: 1%{?dist} Summary: Valued 3D point cloud visualization and analysis Group: Applications/Engineering @@ -33,18 +33,13 @@ BuildRequires: tex(latex) BuildRequires: qhull-devel #Fedora specific PDF dir. -Patch0: %{name}-0.0.6-manual-pdf-loc.patch +Patch0: %{name}-0.0.8-manual-pdf-loc.patch #Fedora specific font dir -Patch1: %{name}-0.0.6-font-path.patch +Patch1: %{name}-0.0.8-font-path.patch -#Fix for density plot mishandling in program (upstream) -Patch2: %{name}-density-fix.patch +#Fix latex manual version # and syntax +Patch2: %{name}-0.0.8-manual-latex.patch -#Fix for refresh tree blockmask mishandle (upstream) -Patch3: %{name}-blockmask-fix.patch - -#Fix for wrong icon -Patch4: %{name}-wrong-icon.patch %description This program is designed to help users visualize and analyze 3D point clouds with an associated real value, in a fast and flexible fashion. It is @@ -58,8 +53,6 @@ useful for general scalar valued point data purposes. %patch0 %patch1 %patch2 -%patch3 -%patch4 %build #--enable-openmp-parallel does not work -- there is a bug in the @@ -83,7 +76,7 @@ make install DESTDIR=%{buildroot} # Install the textures mkdir -p %{buildroot}%{_datadir}/%{name}/textures -cp -p src/textures/* %{buildroot}%{_datadir}/%{name}/textures +cp -p src/textures/textures/* %{buildroot}%{_datadir}/%{name}/textures #Install the manpage @@ -93,7 +86,7 @@ desktop-file-install \ --dir %{buildroot}%{_datadir}/applications \ packaging/%{name}.desktop mkdir -p %{buildroot}%{_datadir}/pixmaps/ -install -Dp -m 644 src/tex-source/%{name}-icon.svg %{buildroot}%{_datadir}/pixmaps/%{name}.svg +install -Dp -m 644 src/tex-source/tex-source/%{name}-icon.svg %{buildroot}%{_datadir}/pixmaps/%{name}.svg #install language files #-- @@ -132,6 +125,9 @@ rm -rf %{buildroot} %changelog +* Sun Oct 23 2011 D Haley - 0.0.8-1 +- Update to 0.0.8 + * Sun Aug 14 2011 D Haley - 0.0.7-1 - Update to 0.0.7