up to next version

README.md

@@ -2,6 +2,23 @@
 
 **Qt-DAB-4** and **Qt-DAB-5** is software for Linux, Windows, MacOS and Raspberry Pi for listening to terrestrial **Digital Audio Broadcasting (DAB and DAB+)**.
 
+-------------------------------------------------------------------
+New in 4.7 and 5.4
+-------------------------------------------------------------------
+
+Apart from fixing a few minor errors and restructuring some parts
+of the software, the main change in these versions - compared to previous
+ones - is handling the "history".
+
+In previous versions, each service (name) encountered was added
+to a history list, in this version the history list is replaced
+by a "scan list". The scan list is filled when scanning (single scan).
+The configuration widget has a selector for choosing that on a
+new scan the list is cleared (the default).
+
+New - compared to the history list - is that a mouse click right
+on an element in the scan list, the service name is added to the
+presets. Of course, a mouse click left will select the service.
 
 Table of Contents
 =================================================================
@@ -106,10 +123,10 @@ on a separate widget is not needed.
 ![4.5](/qt-dab-4-config-widget.png?raw=true)
 ![5.2](/qt-dab-5-config-widget.png?raw=true)
 
-The functionality of the versions is (almost) the same, version 5.1 has
-(most users will not use it though) the possibility of generating "eti" files.
-If there is serious interest for adding the feature to the Qt-DAB-4 interface,
-then let me know.
+The functionality of the versions is (almost) the same, version 5.X has
+(most users will not use it though) the possibility of
+generating "eti" files.  If there is serious interest for
+adding the feature to the Qt-DAB-4 interface, then let me know.
 
 The Qt-DAB-5.2 version has a slightly modified "technical window", 
 it now contains a small spectrum display of the audio output.

dab-processor.h

@@ -128,8 +128,8 @@ Q_OBJECT
 	ficHandler	my_ficHandler;
 	mscHandler	my_mscHandler;
 	phaseReference	phaseSynchronizer;
-	TII_Detector	my_TII_Detector;
 	ofdmDecoder	my_ofdmDecoder;
+	TII_Detector	my_TII_Detector;
 
 	int16_t		attempts;
 	bool		scanMode;

eti-handler/eti-generator.cpp

@@ -380,36 +380,6 @@ std::vector<parameter *> theParameters;
 	return offset;
 }
 
-static void	process_subCh (int nr, parameter *p,
-	                       protection *prot,
-	                       uint8_t *desc) {
-	std::unique_ptr<uint8_t[]> outVector{ new uint8_t[24 * p->bitRate] };
-	if (!outVector) {
-	   std::cerr << "process_subCh - alloc fail";
-	   return;
-	}
-int	j, k;
-
-	memset (outVector.get(), 0, sizeof(uint8_t) * 24 * p -> bitRate);
-
-	prot -> deconvolve (&p -> input [p -> start_cu * CUSize],
-	                                 p -> size * CUSize,
-	                                 outVector.get());
-//
-	for (j = 0; j < 24 * p -> bitRate; j ++) {
-	   outVector [j] ^= desc [j];
-        }
-//
-//	and the storage:
-	for (j = 0; j < 24 * p -> bitRate / 8; j ++) {
-	   int temp = 0;
-	   for (k = 0; k < 8; k ++)
-	      temp = (temp << 1) | (outVector [j * 8 + k] & 01);
-	   p -> output [j] = temp;
-	}
-
-}
-
 void	etiGenerator::process_subCh (int nr, parameter *p,
 	                             protection *prot,
 	                             uint8_t *desc) {

includes/support/history-handler.h → includes/support/scanlist-handler.h

@@ -2,7 +2,7 @@
 /*
  *    Copyright (C) 2019
  *    Jan van Katwijk ([email protected])
- *    Lazy Chair Programming
+ *    Lazy Chair Computing
  *
  *    This file is part of the  qt-dab program
  *
@@ -20,8 +20,8 @@
  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef	__HISTORY_HANDLER__
-#define	__HISTORY_HANDLER__
+#ifndef	__SCANLIST_HANDLER__
+#define	__SCANLIST_HANDLER__
 
 #include	"radio.h"
 #include	<QListView>
@@ -32,20 +32,20 @@
 class	RadioInterface;
 class	descriptorType;
 
-class	historyHandler:public QListView {
+class	scanListHandler:public QListView {
 Q_OBJECT
 public:
-		historyHandler	(RadioInterface *radio,
+		scanListHandler	(RadioInterface *radio,
 	                                 QString fileName);
-		~historyHandler	();
+		~scanListHandler	();
 	void	addElement	(const QString &, const QString &);
-	void	clearHistory	();
+	void	clear_scanList	();
 public slots:
 	void	selectElement	(QModelIndex);
 signals:
-	void	handle_historySelect (const QString &);
+	void	handle_scanListSelect (const QString &);
 private:
-	QStringList	historyList;
+	QStringList	scanList;
 	QStringListModel	displayList;
 	RadioInterface	*radio;
 	QString		fileName;

qt-dab-s4/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 2.8.11 )
-set (objectName qt-dab-4.6)
+set (objectName qt-dab-4.7)
 set (CMAKE_CXX_FLAGS "${CMAKE_XCC_FLAGS} -Wall -std=c++14 -flto")
 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")
 
@@ -287,7 +287,7 @@ endif ()
 	     ../includes/support/preset-handler.h
 	     ../includes/support/presetcombobox.h
 	     ../includes/support/smallqlistview.h
-	     ../includes/support/history-handler.h
+	     ../includes/support/scanlist-handler.h
 	     ../includes/support/color-selector.h
 	     ../includes/support/scheduler.h
 	     ../includes/support/schedule-selector.h
@@ -397,7 +397,7 @@ endif ()
              ../src/support/buttons/verysmallpushbutton.cpp
              ../src/support/buttons/smallqlistview.cpp
              ../src/support/buttons/smallspinbox.cpp 
-	     ../src/support/history-handler.cpp
+	     ../src/support/scanlist-handler.cpp
 	     ../src/support/viterbi-jan/viterbi-handler.cpp
 	     ../src/support/viterbi-spiral/viterbi-spiral.cpp
 	     ../src/support/color-selector.cpp
@@ -467,7 +467,7 @@ endif ()
              ../includes/support/buttons/verysmallpushbutton.h
              ../includes/support/buttons/smallqlistview.h
              ../includes/support/buttons/smallspinbox.h
-	     ../includes/support/history-handler.h
+	     ../includes/support/scanlist-handler.h
 	     ../includes/support/color-selector.h
 	     ../includes/support/scheduler.h
 	     ../includes/support/schedule-selector.h

qt-dab-s4/forms-v4/config-helper.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>343</width>
-    <height>737</height>
+    <height>768</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -222,6 +222,16 @@
      </property>
     </widget>
    </item>
+   <item>
+    <widget class="QCheckBox" name="clearScan_Selector">
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If set, the scanlist will be clear when starting a scan.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="text">
+      <string>clear scanlist on scan</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>

qt-dab-s4/forms-v4/dabradio-4.ui

@@ -17,7 +17,7 @@
    </sizepolicy>
   </property>
   <property name="windowTitle">
-   <string>Qt-DAB-4.6</string>
+   <string>Qt-DAB-4.7</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout_11">
    <item>
@@ -741,17 +741,17 @@ the reach &lt;br /&gt;of this receiver.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</str
             </widget>
            </item>
            <item row="3" column="0">
-            <widget class="smallPushButton" name="historyButton">
+            <widget class="smallPushButton" name="scanListButton">
              <property name="font">
               <font>
                <pointsize>10</pointsize>
               </font>
              </property>
              <property name="toolTip">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;history feature. The software maintains a list of all services encountered. Touching this button will show (hide) the list. By clicking with the left mouse button the software will try to select the service pointed to, by clicking with the ruight mouse button the lit will be deleted.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The scanlist shows the services, found in a scan. Click left will select the element, click right will add the element to the presets&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
              <property name="text">
-              <string>list</string>
+              <string>scan list</string>
              </property>
             </widget>
            </item>

qt-dab-s4/qt-dab-4.pro

@@ -180,7 +180,7 @@ HEADERS += ./radio.h \
 	   ../includes/support/dab-tables.h \
 	   ../includes/support/preset-handler.h \
 	   ../includes/support/presetcombobox.h \
-	   ../includes/support/history-handler.h \
+	   ../includes/support/scanlist-handler.h \
 	   ../includes/support/color-selector.h \
 	   ../includes/support/scheduler.h \
 	   ../includes/support/schedule-selector.h \
@@ -292,7 +292,7 @@ SOURCES += ./main.cpp \
 	   ../src/support/dab-tables.cpp \
 	   ../src/support/preset-handler.cpp \
 	   ../src/support/presetcombobox.cpp \
-	   ../src/support/history-handler.cpp \
+	   ../src/support/scanlist-handler.cpp \
 	   ../src/support/color-selector.cpp \
 	   ../src/support/scheduler.cpp \
 	   ../src/support/schedule-selector.cpp \
@@ -333,7 +333,7 @@ SOURCES += ./main.cpp \
 #
 unix {
 DESTDIR		= ./linux-bin
-TARGET		= qt-dab-4.6
+TARGET		= qt-dab-4.7
 exists ("../.git") {
    GITHASHSTRING = $$system(git rev-parse --short HEAD)
    !isEmpty(GITHASHSTRING) {
@@ -439,7 +439,7 @@ isEmpty(GITHASHSTRING) {
 }
 
 ##for for 64 bit
-#	TARGET		= qt-dab64-4.6
+#	TARGET		= qt-dab64-4.7
 #	DEFINES		+= __BITS64__
 #	DESTDIR		= /usr/shared/w64-programs/windows-dab64-qt
 #	INCLUDEPATH	+= /usr/x64-w64-mingw32/sys-root/mingw/include
@@ -459,7 +459,7 @@ isEmpty(GITHASHSTRING) {
 #	DEFINES		+= __THREADED_BACKEND
 #
 #for win32, comment out the lines above
-	TARGET		= qt-dab32-4.6
+	TARGET		= qt-dab32-4.7
 	DESTDIR		= /usr/shared/w32-programs/windows-dab32-qt
 	INCLUDEPATH	+= /usr/i686-w64-mingw32/sys-root/mingw/include
 	INCLUDEPATH	+= /usr/i686-w64-mingw32/sys-root/mingw/include/qt5/qwt