diff --git a/3Depict-0.0.4-gl-startup.patch b/3Depict-0.0.4-gl-startup.patch deleted file mode 100644 index bf81202..0000000 --- a/3Depict-0.0.4-gl-startup.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff -r 50a287e4484b src/3Depict.cpp ---- src/3Depict.cpp Mon Mar 07 01:33:27 2011 +0000 -+++ src/3Depict.cpp Sun Mar 13 00:53:01 2011 +0000 -@@ -281,7 +281,7 @@ - MainWindowFrame::MainWindowFrame(wxWindow* parent, int id, const wxString& title, const wxPoint& pos, const wxSize& size, long style): - wxFrame(parent, id, title, pos, size, style) - { -- -+ initedOK=false; - programmaticEvent=false; - fullscreenState=0; - //Set up the program icon handler -@@ -324,6 +324,14 @@ - splitterSpectra = new wxSplitterWindow(noteDataView, ID_SPLIT_SPECTRA, wxDefaultPosition, wxDefaultSize, wxSP_3D|wxSP_BORDER); - window_2_pane_2 = new wxPanel(splitterSpectra, wxID_ANY); - panelTop = new BasicGLPane(splitTopBottom); -+ -+ //I had to work this out by studying the construtor -+ if(!panelTop->m_glContext) -+ { -+ cerr << "Unable to initialise the openGL panel. Program cannot start. Please check your video drivers." << endl; -+ return; -+ } -+ - panelLeft = new wxPanel(splitLeftRight, wxID_ANY); - notebookControl = new wxNotebook(panelLeft, ID_NOTEBOOK_CONTROL, wxDefaultPosition, wxDefaultSize, wxNB_RIGHT); - noteTools = new wxPanel(notebookControl, ID_NOTE_PERFORMANCE, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); -@@ -661,7 +669,7 @@ - delete paths; - //----------------- - -- -+ initedOK=true; - - - updateTimer->Start(UPDATE_TIMER_DELAY,wxTIMER_CONTINUOUS); -@@ -4208,7 +4216,7 @@ - { - - //Register signal handler for backtraces -- if (!wxApp::OnInit()) -+ if (!wxApp::OnInit()) - return false; - - //Need to seed random number generator for entire program -@@ -4220,6 +4228,10 @@ - - wxInitAllImageHandlers(); - MainFrame = new MainWindowFrame(NULL, wxID_ANY, wxEmptyString); -+ -+ if(!MainFrame->initOK()) -+ return false; -+ - SetTopWindow(MainFrame); - - #ifdef DEBUG -diff -r 50a287e4484b src/3Depict.h ---- src/3Depict.h Mon Mar 07 01:33:27 2011 +0000 -+++ src/3Depict.h Sun Mar 13 00:53:01 2011 +0000 -@@ -108,6 +108,8 @@ - - //!Current fullscreen status - unsigned int fullscreenState; -+ -+ bool initedOK; - protected: - wxTimer *statusTimer; - wxTimer *progressTimer; -@@ -301,6 +303,10 @@ - - virtual void SetCommandLineFiles(wxArrayString &files); - virtual void updateLastRefreshBox(); -+ -+ -+ bool initOK() const {return initedOK;} -+ - }; // wxGlade: end class - - diff --git a/3Depict-0.0.4-no-debug-wait-for-cin.patch b/3Depict-0.0.4-no-debug-wait-for-cin.patch deleted file mode 100644 index 62015d2..0000000 --- a/3Depict-0.0.4-no-debug-wait-for-cin.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- src/basics.cpp 2011-01-23 03:08:13.000000000 +0000 -+++ src/basics.cpp.new 2011-01-23 19:33:49.499236864 +0000 -@@ -93,7 +93,7 @@ - std::cerr << "ASSERTION ERROR!" << std::endl; - std::cerr << "Filename: " << filename << std::endl; - std::cerr << "Line number: " << lineNumber << std::endl; -- -+/* - std::cerr << "Do you wish to continue?(y/n)"; - char y = 'a'; - while (y != 'n' && y != 'y') -@@ -101,6 +101,7 @@ - - if (y != 'y') - exit(1); -+*/ - } - - void dh_warn(const char * const filename, const unsigned int lineNumber,const char *message) diff --git a/3Depict-0.0.4-texture-path.patch b/3Depict-0.0.4-texture-path.patch deleted file mode 100644 index 6434461..0000000 --- a/3Depict-0.0.4-texture-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -r bf43078bcaed src/basics.h ---- src/basics.h Fri Nov 26 00:20:07 2010 +0000 -+++ src/basics.h Fri Nov 26 00:21:07 2010 +0000 -@@ -109,7 +109,7 @@ - - //Mac - // - Look in cwd -- return std::string(name); -+ return std::string("/usr/share/3Depict/") + std::string(name); - } - - template diff --git a/3Depict-0.0.5-manual-pdf-loc.patch b/3Depict-0.0.5-manual-pdf-loc.patch new file mode 100644 index 0000000..5d338be --- /dev/null +++ b/3Depict-0.0.5-manual-pdf-loc.patch @@ -0,0 +1,16 @@ +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-latex-error-and-htlatex-niceness.patch b/3Depict-latex-error-and-htlatex-niceness.patch new file mode 100644 index 0000000..465f405 --- /dev/null +++ b/3Depict-latex-error-and-htlatex-niceness.patch @@ -0,0 +1,21 @@ +diff -r fdd128a9a03e docs/manual-latex/manual.tex +--- docs/manual-latex/manual.tex Sun Mar 27 18:01:56 2011 +1100 ++++ docs/manual-latex/manual.tex Sun Mar 27 18:03:00 2011 +1100 +@@ -177,7 +177,7 @@ + \item \textbf{Ctrl}: Pan camera + \item \textbf{Tab} : Swivel camera (Look about) + \item \textbf{Ctrl +Tab} (Windows \textbf{Ctrl+Alt}): Roll camera around viewport centre. Note that the rolling motion is controlled by the position of the mouse click. +-\item \txtbf{Space/Shift+Space/Ctrl+Space} : Reset camera bounds and position to look along X,Y or Z axes respectively. ++\item \textbf{Space/Shift+Space/Ctrl+Space} : Reset camera bounds and position to look along X,Y or Z axes respectively. + \item \textbf{+/-} : Zoom in/out. + + \end{itemize} +@@ -420,7 +420,7 @@ + Parameter Description: + \begin{itemize} + \item \textbf{Core classification distance} : This distance is the maximum distance between which items initially marked ``core'' by their value can be separated from another core point (up to Core kNN Max) in order to not be discounted in the clustering. This aids in removing isolated points that are initially marked as core. This option is disabled if the value is set to 0. +- \item \textbf{Core kNN max} : The Core k$^\mathrm{th}$ nearest neighbour maximum for core classification. This modifies the core classification stage, only looking up to some max kNN (unclassified core only) for other core points ++ \item \textbf{Core kNN max} : The Core k-th nearest neighbour maximum for core classification. This modifies the core classification stage, only looking up to some max kNN (unclassified core only) for other core points + \end{itemize} + + Algorithm Description; each of these is conducted in sequence to generate the final clustered output. diff --git a/3Depict.spec b/3Depict.spec index 8336610..ab5ad77 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict -Version: 0.0.4 -Release: 3%{?dist} +Version: 0.0.5 +Release: 1%{?dist} Summary: Valued 3D point cloud visualization and analysis Group: Applications/Engineering @@ -11,11 +11,6 @@ Source0: http://downloads.sourceforge.net/threedepict/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -#Fedora specific texture path install location -Patch0: %{name}-%{version}-texture-path.patch -#Fix bug for opengl startup crash on initalisiation fail -Patch1: %{name}-%{version}-gl-startup.patch - #Mathgl for plotting BuildRequires: mathgl-devel #Mesa for GLU @@ -36,6 +31,10 @@ BuildRequires: tex(latex) #Required for surface removal algorithms BuildRequires: qhull-devel +#Error in latex file, and htlatex dislikes the $^{}$ notation. +Patch0: 3Depict-latex-error-and-htlatex-niceness.patch +#Fedora specific PDF dir. +Patch1: 3Depict-0.0.5-manual-pdf-loc.patch %description This program is designed to help users visualize and analyze 3D point clouds @@ -44,7 +43,9 @@ specifically targeted to atom probe tomography applications, but may be useful for general scalar valued point data purposes. %prep + %setup -q + %patch0 %patch1 @@ -54,11 +55,13 @@ useful for general scalar valued point data purposes. # -fopenmp export CFLAGS="$RPM_OPT_FLAGS -fopenmp" export CXXFLAGS="$RPM_OPT_FLAGS -fopenmp" -%configure --enable-no-debug-checks +%configure --disable-debug-checks make %{?_smp_mflags} pushd docs/manual-latex pdflatex manual.tex +bibtex manual +pdflatex manual.tex popd @@ -100,6 +103,9 @@ rm -rf %{buildroot} %changelog +* Mon Mar 27 2011 D Haley - 0.0.5-1 +- New upstream release + * Sat Mar 13 2011 D Haley - 0.0.4-3 - Patch opengl startup code -- peek at gl context. Possible fix for bug 684390 diff --git a/sources b/sources index 90256e7..9c5d02d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7775fad11781b5481328733256b4024e 3Depict-0.0.4.tar.gz +559850366bd607f11535a5a6efb89c2b 3Depict-0.0.5.tar.gz