X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fstrutil.c;h=382708936244ba9a3f0b2aa0972c66fab12177c2;hb=3553451f1ed45d92bff11952cb131ac6a891b69f;hp=11d614b3ccd5bfed0cc4c1b2c3d0b87609038545;hpb=5c436a3bad14fe6edbc1c3d99006d8e81293ca30;p=libsigrok.git

diff --git a/src/strutil.c b/src/strutil.c
index 11d614b3..38270893 100644
--- a/src/strutil.c
+++ b/src/strutil.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
@@ -348,35 +347,53 @@ SR_API char *sr_samplerate_string(uint64_t samplerate)
 }
 
 /**
- * Convert a numeric frequency value to the "natural" string representation
- * of its period.
+ * Convert a numeric period value to the "natural" string representation
+ * of its period value.
  *
- * E.g. a value of 3000000 would be converted to "3 us", 20000 to "50 ms".
+ * The period is specified as a rational number's numerator and denominator.
  *
- * @param frequency The frequency in Hz.
+ * E.g. a pair of (1, 5) would be converted to "200 ms", (10, 100) to "100 ms".
  *
- * @return A newly allocated string representation of the frequency value,
+ * @param v_p The period numerator.
+ * @param v_q The period denominator.
+ *
+ * @return A newly allocated string representation of the period value,
  *         or NULL upon errors. The caller is responsible to g_free() the
  *         memory.
  *
- * @since 0.1.0
+ * @since 0.5.0
  */
-SR_API char *sr_period_string(uint64_t frequency)
+SR_API char *sr_period_string(uint64_t v_p, uint64_t v_q)
 {
+	double freq, v;
 	char *o;
-	int r;
+	int prec, r;
+
+	freq = 1 / ((double)v_p / v_q);
 
-	/* Allocate enough for a uint64_t as string + " ms". */
 	o = g_malloc0(30 + 1);
 
-	if (frequency >= SR_GHZ(1))
-		r = snprintf(o, 30, "%" PRIu64 " ns", frequency / 1000000000);
-	else if (frequency >= SR_MHZ(1))
-		r = snprintf(o, 30, "%" PRIu64 " us", frequency / 1000000);
-	else if (frequency >= SR_KHZ(1))
-		r = snprintf(o, 30, "%" PRIu64 " ms", frequency / 1000);
-	else
-		r = snprintf(o, 30, "%" PRIu64 " s", frequency);
+	if (freq > SR_GHZ(1)) {
+		v = (double)v_p / v_q * 1000000000000.0;
+		prec = ((v - (uint64_t)v) < FLT_MIN) ? 0 : 3;
+		r = snprintf(o, 30, "%.*f ps", prec, v);
+	} else if (freq > SR_MHZ(1)) {
+		v = (double)v_p / v_q * 1000000000.0;
+		prec = ((v - (uint64_t)v) < FLT_MIN) ? 0 : 3;
+		r = snprintf(o, 30, "%.*f ns", prec, v);
+	} else if (freq > SR_KHZ(1)) {
+		v = (double)v_p / v_q * 1000000.0;
+		prec = ((v - (uint64_t)v) < FLT_MIN) ? 0 : 3;
+		r = snprintf(o, 30, "%.*f us", prec, v);
+	} else if (freq > 1) {
+		v = (double)v_p / v_q * 1000.0;
+		prec = ((v - (uint64_t)v) < FLT_MIN) ? 0 : 3;
+		r = snprintf(o, 30, "%.*f ms", prec, v);
+	} else {
+		v = (double)v_p / v_q;
+		prec = ((v - (uint64_t)v) < FLT_MIN) ? 0 : 3;
+		r = snprintf(o, 30, "%.*f s", prec, v);
+	}
 
 	if (r < 0) {
 		/* Something went wrong... */
@@ -538,8 +555,13 @@ SR_API uint64_t sr_parse_timestring(const char *timestring)
 /** @since 0.1.0 */
 SR_API gboolean sr_parse_boolstring(const char *boolstr)
 {
-	if (!boolstr)
-		return FALSE;
+	/*
+	 * Complete absence of an input spec is assumed to mean TRUE,
+	 * as in command line option strings like this:
+	 *   ...:samplerate=100k:header:numchannels=4:...
+	 */
+	if (!boolstr || !*boolstr)
+		return TRUE;
 
 	if (!g_ascii_strncasecmp(boolstr, "true", 4) ||
 	    !g_ascii_strncasecmp(boolstr, "yes", 3) ||