diff --git a/3Depict-blockmask-fix.patch b/3Depict-blockmask-fix.patch new file mode 100644 index 0000000..aa51a93 --- /dev/null +++ b/3Depict-blockmask-fix.patch @@ -0,0 +1,30 @@ +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 new file mode 100644 index 0000000..625309f --- /dev/null +++ b/3Depict-density-fix.patch @@ -0,0 +1,47 @@ +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 new file mode 100644 index 0000000..b8cbdb9 --- /dev/null +++ b/3Depict-wrong-icon.patch @@ -0,0 +1,1171 @@ +--- 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 f434194..fcbc7f6 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,5 +1,5 @@ Name: 3Depict -Version: 0.0.6 +Version: 0.0.7 Release: 1%{?dist} Summary: Valued 3D point cloud visualization and analysis Group: Applications/Engineering @@ -9,6 +9,7 @@ License: GPLv3+ URL: http://threedepict.sourceforge.net Source0: http://downloads.sourceforge.net/threedepict/%{name}-%{version}.tar.gz + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #Mathgl for plotting @@ -32,10 +33,18 @@ BuildRequires: tex(latex) BuildRequires: qhull-devel #Fedora specific PDF dir. -Patch0: 3Depict-0.0.6-manual-pdf-loc.patch +Patch0: %{name}-0.0.6-manual-pdf-loc.patch #Fedora specific font dir -Patch1: 3Depict-0.0.6-font-path.patch +Patch1: %{name}-0.0.6-font-path.patch + +#Fix for density plot mishandling in program (upstream) +Patch2: %{name}-density-fix.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 @@ -48,6 +57,9 @@ 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 @@ -81,16 +93,33 @@ desktop-file-install \ --dir %{buildroot}%{_datadir}/applications \ packaging/%{name}.desktop mkdir -p %{buildroot}%{_datadir}/pixmaps/ -install -Dp -m 644 src/tex-source/3Depict-icon.svg %{buildroot}%{_datadir}/pixmaps/3Depict.svg +install -Dp -m 644 src/tex-source/%{name}-icon.svg %{buildroot}%{_datadir}/pixmaps/%{name}.svg + +#install language files +#-- +#Remap locale names +mv locales/de_DE/ locales/de/ + +mkdir -p %{buildroot}/%{_datadir}/locale/ +cp -R locales/* %{buildroot}/%{_datadir}/locale/ + +#Restore the internal build's locale namign +mv locales/de/ locales/de_DE/ +#-- + #Move the documentation such that it is picked up by the doc macro mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf +#Locale stuff +%find_lang %{name} + + %clean rm -rf %{buildroot} -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc COPYING AUTHORS ChangeLog README TODO %{name}-%{version}-manual.pdf %{_bindir}/%{name} @@ -103,7 +132,10 @@ rm -rf %{buildroot} %changelog -* Fri May 20 2011 D Haley - 0.0.6-1 +* Sun Aug 14 2011 D Haley - 0.0.7-1 +- Update to 0.0.7 + +* Sun May 20 2011 D Haley - 0.0.6-1 - Update to 0.0.6 * Mon Mar 27 2011 D Haley - 0.0.5-1 diff --git a/sources b/sources index d4af7bf..bd0e589 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a26b0011a0bc483ecde022f0f4e6870d 3Depict-0.0.6.tar.gz +d7c8323c01fd53770548db9798075e0a 3Depict-0.0.7.tar.gz