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

* Update to 0.0.19

Browse source
This commit is contained in:
mycae 2016-08-03 21:33:54 -04:00
commit cb5ae09511
5 changed files with 1283 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

171
3Depict-0.0.18-upstream.patch
View file

@ -1,171 +0,0 @@
diff -r 7510fdcc8b8a -r 185ccbce5421 src/3Depict.cpp
--- src/3Depict.cpp Mon Aug 25 14:41:48 2014 +0100
+++ src/3Depict.cpp Mon Aug 25 14:42:29 2014 +0100
@@ -39,6 +39,12 @@
class threeDepictApp: public wxApp {
private:
+#ifndef DEBUG
+ //instance of this class suppresses internal wx error dialogs.
+ // these are a nuisance in release code, as recovered errors often annoy the user
+ wxLogNull nullifyLogs;
+#endif
+
MainWindowFrame* MainFrame ;
wxArrayString commandLineFiles;
wxLocale* usrLocale;
@@ -62,9 +68,6 @@
void MacReopenFile(const wxString & fileName);
#endif
-#ifdef DEBUG
- void setEventloggerFile(const char *file);
-#endif
};
//Check version is in place because wxT is deprecated for wx 2.9
diff -r 185ccbce5421 -r c8ff86119e58 src/backend/filters/clusterAnalysis.cpp
--- src/backend/filters/clusterAnalysis.cpp Mon Aug 25 14:42:29 2014 +0100
+++ src/backend/filters/clusterAnalysis.cpp Mon Aug 25 14:43:10 2014 +0100
@@ -264,7 +264,7 @@
ClusterAnalysisFilter::ClusterAnalysisFilter() : algorithm(CLUSTER_LINK_ERODE),
enableCoreClassify(false), coreDist(0.0f), coreKNN(1), linkDist(0.5f),
- enableBulkLink(false), bulkLink(1), enableErosion(false), dErosion(0.25),
+ enableBulkLink(false), bulkLink(0.25), enableErosion(false), dErosion(0.25),
wantClusterID(false), wantCropSize(false), nMin(0),nMax(std::numeric_limits<size_t>::max()),
wantClusterSizeDist(false),logClusterSize(false),
wantClusterComposition(true),normaliseComposition(true),
diff -r c8ff86119e58 -r 55ec5e056846 src/gui/mainFrame.cpp
--- src/gui/mainFrame.cpp Mon Aug 25 14:43:10 2014 +0100
+++ src/gui/mainFrame.cpp Mon Aug 25 14:51:53 2014 +0100
@@ -464,7 +464,7 @@
fileExport->Append(ID_FILE_EXPORT_IMAGE, TRANS("&Image...\tCtrl+I"), TRANS("Export Current 3D View"), wxITEM_NORMAL);
fileExport->Append(ID_FILE_EXPORT_IONS, TRANS("Ion&s...\tCtrl+N"), TRANS("Export Ion Data"), wxITEM_NORMAL);
fileExport->Append(ID_FILE_EXPORT_RANGE, TRANS("Ran&ges...\tCtrl+G"), TRANS("Export Range Data"), wxITEM_NORMAL);
- fileExport->Append(ID_FILE_EXPORT_FILTER_ANIMATION, TRANS("&Animate Filters...\tCtrl+A"), TRANS("Export Animated Filter"), wxITEM_NORMAL);
+ fileExport->Append(ID_FILE_EXPORT_FILTER_ANIMATION, TRANS("&Animate Filters...\tCtrl+T"), TRANS("Export Animated Filter"), wxITEM_NORMAL);
fileExport->Append(ID_FILE_EXPORT_ANIMATION, TRANS("Ani&mate Camera...\tCtrl+M"), TRANS("Export Animated Camera"), wxITEM_NORMAL);
fileExport->Append(ID_FILE_EXPORT_PACKAGE, TRANS("Pac&kage...\tCtrl+K"), TRANS("Export analysis package"), wxITEM_NORMAL);
diff -r 9d545342c3ad -r 3c853d1f5af7 src/backend/filters/externalProgram.cpp
--- src/backend/filters/externalProgram.cpp Mon Aug 25 14:52:42 2014 +0100
+++ src/backend/filters/externalProgram.cpp Mon Aug 25 14:53:04 2014 +0100
@@ -551,7 +551,7 @@
p.name=TRANS("Work Dir");
p.data= workingDir;
- p.type=PROPERTY_TYPE_STRING;
+ p.type=PROPERTY_TYPE_DIR;
p.helpText=TRANS("Directory to run the command in");
p.key=EXTERNALPROGRAM_KEY_WORKDIR;
propertyList.addProperty(p,curGroup);
diff -r 9d545342c3ad -r 3c853d1f5af7 src/common/constants.h
--- src/common/constants.h Mon Aug 25 14:52:42 2014 +0100
+++ src/common/constants.h Mon Aug 25 14:53:04 2014 +0100
@@ -57,6 +57,7 @@
PROPERTY_TYPE_POINT3D,
PROPERTY_TYPE_CHOICE,
PROPERTY_TYPE_FILE,
+ PROPERTY_TYPE_DIR,
PROPERTY_TYPE_ENUM_END //Not a prop, just end of enum
};
diff -r 9d545342c3ad -r 3c853d1f5af7 src/wx/propertyGridUpdater.cpp
--- src/wx/propertyGridUpdater.cpp Mon Aug 25 14:52:42 2014 +0100
+++ src/wx/propertyGridUpdater.cpp Mon Aug 25 14:53:04 2014 +0100
@@ -61,7 +61,7 @@
g->Append(new wxPropertyCategory(string("") + title,title));
- //Set the children of thies property
+ //Set the children of this property
for(size_t uj=0;uj<propGrouping.size();uj++)
{
FilterProperty fp;
@@ -83,6 +83,7 @@
boolVal);
break;
};
+ //TODO: we need a PROPERTY_TYPE_UINT
case PROPERTY_TYPE_INTEGER:
{
long long iV;
@@ -145,16 +146,24 @@
break;
}
+ case PROPERTY_TYPE_DIR:
+ {
+ pgp = new wxDirProperty(fp.name,keyStr,fp.data);
+ break;
+ }
}
+ //Set the tooltip
pgp->SetHelpString(fp.helpText);
+ //add the property to the grid
g->Append(pgp);
switch(fp.type)
{
case PROPERTY_TYPE_BOOL:
{
+ //if a bool property, use a checkbox to edit
g->SetPropertyEditor(pgp,wxPGEditor_CheckBox);
break;
}
diff -r 7372047ee6f9 src/common/basics.cpp
--- src/common/basics.cpp Sun Aug 03 16:58:06 2014 -0400
+++ src/common/basics.cpp Sun Aug 03 17:01:04 2014 -0400
@@ -1471,6 +1471,21 @@
return 0;
}
+bool isNotDirectory(const char *filename)
+{
+ struct stat statbuf;
+
+ if(stat(filename,&statbuf) == -1)
+ return false;
+
+ return (statbuf.st_mode !=S_IFDIR);
+}
+
+bool rmFile(const std::string &filename)
+{
+ return remove(filename.c_str()) == 0;
+}
+
#ifdef DEBUG
bool isValidXML(const char *filename)
{
@@ -1503,27 +1518,6 @@
return true;
}
-#if !defined(__WIN32__) && !defined(__WIN64)
-bool isNotDirectory(const char *filename)
-{
- struct stat statbuf;
-
- if(stat(filename,&statbuf) == -1)
- return false;
-
- return (statbuf.st_mode !=S_IFDIR);
-}
-
-bool rmFile(const std::string &filename)
-{
- return remove(filename.c_str()) == 0;
-}
-#elif defined(__WIN32) || defined(__WIN64)
-bool rmFile(const std::string &filename)
-{
- return DeleteFile((const wchar_t*)filename.c_str()) == 0;
-}
-#endif
#endif

0
3Depict-0.0.18-font-path.patch → 3Depict-0.0.19-font-path.patch
View file

0
3Depict-0.0.18-manual-pdf-loc.patch → 3Depict-0.0.19-manual-pdf-loc.patch
View file

1243
3Depict-0.0.19-upstream-effd078610a7.patch Normal file
View file

File diff suppressed because it is too large Load diff

52
3Depict.spec
View file

@ -1,6 +1,6 @@
Name: 3Depict
Version: 0.0.18
Release: 2%{?dist}
Version: 0.0.19
Release: 1%{?dist}
Summary: Valued 3D point cloud visualization and analysis
Group: Applications/Engineering
@ -10,8 +10,6 @@ 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
BuildRequires: mathgl-devel
#Mesa for GLU
@ -39,7 +37,8 @@ BuildRequires: qhull-devel
Patch0: %{name}-%{version}-manual-pdf-loc.patch
#Fedora specific font dir
Patch1: %{name}-%{version}-font-path.patch
#Upstream post-release patches from hg repo
Patch2: %{name}-%{version}-upstream-effd078610a7.patch
%description
This software is designed to help users visualize and analyze 3D point clouds
@ -53,6 +52,17 @@ useful for general scalar valued point data purposes.
%patch0
%patch1
%patch2
%if 0%{?fedora} > 24
# Installation directory has changed
sed -i -e 's,qhull/qhull_a.h,libqhull/qhull_a.h,' \
src/backend/filters/filterCommon.h \
src/backend/filters/algorithms/rdf.cpp \
configure configure.ac
# Avoid rerunning the autotools
touch -r aclocal.m4 configure configure.ac
%endif
%build
#Due to bug 1077718, wx-config cannot be specified, due to
@ -61,7 +71,6 @@ useful for general scalar valued point data purposes.
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
# Install the textures
@ -98,13 +107,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf
%find_lang %{name}
%clean
rm -rf %{buildroot}
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING AUTHORS ChangeLog README TODO %{name}-%{version}-manual.pdf
%license COPYING
%doc AUTHORS ChangeLog README TODO %{name}-%{version}-manual.pdf
%{_bindir}/%{name}
%dir %{_datadir}/%{name}/
%dir %{_datadir}/%{name}/textures
@ -115,6 +120,28 @@ rm -rf %{buildroot}
%changelog
* Wed Jun 01 2016 D Haley <mycae(a!t)gmx.com> - 0.0.19-1
- Update to 0.0.19
- Remove gcc patch, fixed upstream
- Add upstream patch
* Fri Apr 29 2016 Ralf Corsépius <corsepiu@fedoraproject.org> - 0.0.18-7
- Rebuild for qhull-2015.2-1.
- Reflect qhull_a.h's location having changed.
* Tue Mar 8 2016 Orion Poplawski <orion@cora.nwra.com> - 0.0.18-6
- Add patch for fix compilation with gcc 6
* Mon Feb 22 2016 Orion Poplawski <orion@cora.nwra.com> - 0.0.18-5
- Rebuild for gsl 2.1
- Cleanup spec
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.18-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Sun Nov 29 2015 Kalev Lember <klember@redhat.com> - 0.0.18-3
- Rebuilt for libmgl soname bump
* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.18-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
@ -227,3 +254,4 @@ rm -rf %{buildroot}
* Sun Aug 08 2010 D Haley <mycae(a!t)yahoo.com> - 0.0.1-1
- Initial package