From 10fd2d15c38527f0d8d9f7de06a1c57157997513 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (office)" <j.wuttke@fz-juelich.de>
Date: Wed, 5 May 2010 10:50:57 +0200
Subject: [PATCH] forgotten
---
pub/doc/frida.1 | 6 +-----
pub/doc/frida.html | 7 -------
pub/doc/frida.pod | 6 ------
pub/src/calc.cpp | 2 +-
pub/src/dualplot.cpp | 7 +++----
5 files changed, 5 insertions(+), 23 deletions(-)
diff --git a/pub/doc/frida.1 b/pub/doc/frida.1
index 6e4fce35..21e2b1d8 100644
--- a/pub/doc/frida.1
+++ b/pub/doc/frida.1
@@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "FRIDA 1"
-.TH FRIDA 1 "2010-04-07" "perl v5.10.1" "frida manual"
+.TH FRIDA 1 "2010-05-04" "perl v5.10.1" "frida manual"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -134,10 +134,6 @@ Frida \- Fast reliable interactive data analysis
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
\&\fBfrida\fR
-.SH "NEWS"
-.IX Header "NEWS"
-The first \s-1JCNS\s0 School on Data Analysis for Quasielastic Neutron Scattering
-with \s-1FRIDA\s0 will take place 28\-29 April 2010 at Garching. Register now: http://www.jcns.info/DataAnalysis2010/
.SH "DESCRIPTION"
.IX Header "DESCRIPTION"
Frida is software for scientific data analysis, primarily written for inelastic neutron scattering. Its data model is quite generic (data files consist of x\-y-dy tables that are differentiated by z coordinates), so that it can be used for many different kinds of observational data.
diff --git a/pub/doc/frida.html b/pub/doc/frida.html
index 8a1810df..8a0382b9 100644
--- a/pub/doc/frida.html
+++ b/pub/doc/frida.html
@@ -19,7 +19,6 @@
<li><a href="#name">NAME</a></li>
<li><a href="#synopsis">SYNOPSIS</a></li>
- <li><a href="#news">NEWS</a></li>
<li><a href="#description">DESCRIPTION</a></li>
<li><a href="#installation">INSTALLATION</a></li>
<li><a href="#documentation">DOCUMENTATION</a></li>
@@ -49,12 +48,6 @@
<p>
</p>
<hr />
-<h1><a name="news">NEWS</a></h1>
-<p>The first JCNS School on Data Analysis for Quasielastic Neutron Scattering
-with FRIDA will take place 28-29 April 2010 at Garching. Register now: <a href="http://www.jcns.info/DataAnalysis2010/">http://www.jcns.info/DataAnalysis2010/</a></p>
-<p>
-</p>
-<hr />
<h1><a name="description">DESCRIPTION</a></h1>
<p>Frida is software for scientific data analysis, primarily written for inelastic neutron scattering. Its data model is quite generic (data files consist of x-y-dy tables that are differentiated by z coordinates), so that it can be used for many different kinds of observational data.</p>
<p>
diff --git a/pub/doc/frida.pod b/pub/doc/frida.pod
index f205dc44..3369a4d2 100644
--- a/pub/doc/frida.pod
+++ b/pub/doc/frida.pod
@@ -17,12 +17,6 @@ Frida - Fast reliable interactive data analysis
B<frida>
-=head1 NEWS
-
-The first JCNS School on Data Analysis for Quasielastic Neutron Scattering
-with FRIDA will take place 28-29 April 2010 at Garching. Register now: http://www.jcns.info/DataAnalysis2010/
-
-
=head1 DESCRIPTION
Frida is software for scientific data analysis, primarily written for inelastic neutron scattering. Its data model is quite generic (data files consist of x-y-dy tables that are differentiated by z coordinates), so that it can be used for many different kinds of observational data.
diff --git a/pub/src/calc.cpp b/pub/src/calc.cpp
index 0ba374a0..7b79c075 100644
--- a/pub/src/calc.cpp
+++ b/pub/src/calc.cpp
@@ -35,7 +35,7 @@ void NCalc::Calculator()
if (s[0]=='q')
return;
if (s[0]=='h' || s[0]=='?') {
- printf( "enter valid arithmetic expression, or q to quit\n");
+ printf( "enter expression, or q to quit\n");
continue;
}
try {
diff --git a/pub/src/dualplot.cpp b/pub/src/dualplot.cpp
index e9a9abf1..3d72563b 100644
--- a/pub/src/dualplot.cpp
+++ b/pub/src/dualplot.cpp
@@ -211,10 +211,9 @@ void CPlot::addSpec( bool as_line, int style_no,
nout++;
}
fclose(gp_fd);
- if( !nout ){
- cout << "no points in frame: " << info << "\n";
- return;
- }
+ if( !nout )
+ throw "no points in frame: " + info;
+
// Postscript copy:
snprintf( outlin, mLin, "\n%3u [", ++ps_snum );
--
GitLab