Skip to content

Commit 77b2028

Browse files
dreamsource-taidreamsource-tai
committed
Rename namespace
1 parent 99a2a18 commit 77b2028

208 files changed

Lines changed: 333 additions & 640 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CMakeLists.txt‎

Lines changed: 1 addition & 199 deletions
Original file line numberDiff line numberDiff line change
@@ -237,208 +237,10 @@ find_package(Threads)
237237

238238
set(DSView_SOURCES
239239
DSView/main.cpp
240-
DSView/dsapplication.cpp
241-
DSView/pv/log.cpp
242-
DSView/pv/sigsession.cpp
243-
DSView/pv/mainwindow.cpp
244-
DSView/pv/data/snapshot.cpp
245-
DSView/pv/data/signaldata.cpp
246-
DSView/pv/data/logicsnapshot.cpp
247-
DSView/pv/data/analogsnapshot.cpp
248-
DSView/pv/dialogs/deviceoptions.cpp
249-
DSView/pv/prop/property.cpp
250-
DSView/pv/prop/int.cpp
251-
DSView/pv/prop/enum.cpp
252-
DSView/pv/prop/double.cpp
253-
DSView/pv/prop/bool.cpp
254-
DSView/pv/prop/binding/binding.cpp
255-
DSView/pv/toolbars/samplingbar.cpp
256-
DSView/pv/view/viewport.cpp
257-
DSView/pv/view/view.cpp
258-
DSView/pv/view/timemarker.cpp
259-
DSView/pv/view/signal.cpp
260-
DSView/pv/view/ruler.cpp
261-
DSView/pv/view/logicsignal.cpp
262-
DSView/pv/view/header.cpp
263-
DSView/pv/view/cursor.cpp
264-
DSView/pv/view/analogsignal.cpp
265-
DSView/pv/prop/binding/deviceoptions.cpp
266-
DSView/pv/toolbars/trigbar.cpp
267-
DSView/pv/toolbars/filebar.cpp
268-
DSView/pv/dock/protocoldock.cpp
269-
DSView/pv/dock/triggerdock.cpp
270-
DSView/pv/dock/measuredock.cpp
271-
DSView/pv/dock/searchdock.cpp
272-
DSView/pv/toolbars/logobar.cpp
273-
DSView/pv/dialogs/about.cpp
274-
DSView/pv/dialogs/search.cpp
275-
DSView/pv/data/dsosnapshot.cpp
276-
DSView/pv/view/dsosignal.cpp
277-
DSView/pv/view/dsldial.cpp
278-
DSView/pv/dock/dsotriggerdock.cpp
279-
DSView/pv/view/trace.cpp
280-
DSView/pv/data/decoderstack.cpp
281-
DSView/pv/data/decode/rowdata.cpp
282-
DSView/pv/data/decode/row.cpp
283-
DSView/pv/data/decode/decoder.cpp
284-
DSView/pv/data/decode/annotation.cpp
285-
DSView/pv/view/decodetrace.cpp
286-
DSView/pv/prop/binding/decoderoptions.cpp
287-
DSView/pv/widgets/fakelineedit.cpp
288-
DSView/pv/widgets/decodermenu.cpp
289-
DSView/pv/widgets/decodergroupbox.cpp
290-
DSView/pv/prop/string.cpp
291-
DSView/pv/dialogs/storeprogress.cpp
292-
DSView/pv/storesession.cpp
293-
DSView/pv/view/devmode.cpp
294-
DSView/pv/dialogs/waitingdialog.cpp
295-
DSView/pv/dialogs/dsomeasure.cpp
296-
DSView/pv/dialogs/calibration.cpp
297-
DSView/pv/data/decodermodel.cpp
298-
DSView/pv/dialogs/protocollist.cpp
299-
DSView/pv/dialogs/protocolexp.cpp
300-
DSView/pv/dialogs/fftoptions.cpp
301-
DSView/pv/data/mathstack.cpp
302-
DSView/pv/view/mathtrace.cpp
303-
DSView/pv/toolbars/titlebar.cpp
304-
DSView/pv/mainframe.cpp
305-
DSView/pv/widgets/border.cpp
306-
DSView/pv/dialogs/dsmessagebox.cpp
307-
DSView/pv/dialogs/shadow.cpp
308-
DSView/pv/dialogs/dsdialog.cpp
309-
DSView/pv/dialogs/interval.cpp
310-
DSView/pv/prop/binding/probeoptions.cpp
311-
DSView/pv/view/viewstatus.cpp
312-
DSView/pv/dialogs/lissajousoptions.cpp
313-
DSView/pv/view/lissajoustrace.cpp
314-
DSView/pv/view/spectrumtrace.cpp
315-
DSView/pv/data/spectrumstack.cpp
316-
DSView/pv/dialogs/mathoptions.cpp
317-
DSView/pv/dialogs/regionoptions.cpp
318-
DSView/pv/view/xcursor.cpp
319-
DSView/pv/dock/protocoldock.cpp
320-
DSView/pv/data/decoderstack.cpp
321-
DSView/pv/data/decode/annotation.cpp
322-
DSView/pv/data/decode/decoder.cpp
323-
DSView/pv/data/decode/row.cpp
324-
DSView/pv/data/decode/rowdata.cpp
325-
DSView/pv/prop/binding/decoderoptions.cpp
326-
DSView/pv/view/decodetrace.cpp
327-
DSView/pv/widgets/decodergroupbox.cpp
328-
DSView/pv/widgets/decodermenu.cpp
329-
DSView/pv/config/appconfig.cpp
330-
DSView/pv/appcontrol.cpp
331-
DSView/pv/dstimer.cpp
332-
DSView/pv/eventobject.cpp
333-
DSView/pv/ZipMaker.cpp
334-
DSView/pv/data/decode/annotationrestable.cpp
335-
DSView/pv/data/decode/decoderstatus.cpp
336-
DSView/pv/dock/protocolitemlayer.cpp
337-
DSView/pv/ui/msgbox.cpp
338-
DSView/pv/ui/dscombobox.cpp
339-
DSView/pv/dsvdef.cpp
340-
DSView/pv/dialogs/applicationpardlg.cpp
341-
DSView/pv/dock/keywordlineedit.cpp
342-
DSView/pv/dock/searchcombobox.cpp
343-
DSView/pv/dialogs/decoderoptionsdlg.cpp
344-
DSView/pv/utility/encoding.cpp
345-
DSView/pv/utility/path.cpp
346-
DSView/pv/utility/array.cpp
347-
DSView/pv/deviceagent.cpp
348-
DSView/pv/ui/langresource.cpp
349-
DSView/pv/ui/fn.cpp
350240
)
351241

352242
set(DSView_HEADERS
353-
DSView/mystyle.h
354-
DSView/pv/log.h
355-
DSView/pv/sigsession.h
356-
DSView/pv/mainwindow.h
357-
DSView/pv/dialogs/deviceoptions.h
358-
DSView/pv/prop/property.h
359-
DSView/pv/prop/int.h
360-
DSView/pv/prop/enum.h
361-
DSView/pv/prop/double.h
362-
DSView/pv/prop/bool.h
363-
DSView/pv/toolbars/samplingbar.h
364-
DSView/pv/view/viewport.h
365-
DSView/pv/view/view.h
366-
DSView/pv/view/timemarker.h
367-
DSView/pv/view/ruler.h
368-
DSView/pv/view/header.h
369-
DSView/pv/view/cursor.h
370-
DSView/pv/toolbars/trigbar.h
371-
DSView/pv/toolbars/filebar.h
372-
DSView/pv/dock/protocoldock.h
373-
DSView/pv/dock/triggerdock.h
374-
DSView/pv/dock/measuredock.h
375-
DSView/pv/dock/searchdock.h
376-
DSView/pv/toolbars/logobar.h
377-
DSView/pv/dialogs/about.h
378-
DSView/pv/dialogs/search.h
379-
DSView/pv/dock/dsotriggerdock.h
380-
DSView/pv/view/trace.h
381-
DSView/pv/data/decoderstack.h
382-
DSView/pv/view/decodetrace.h
383-
DSView/pv/widgets/fakelineedit.h
384-
DSView/pv/widgets/decodermenu.h
385-
DSView/pv/widgets/decodergroupbox.h
386-
DSView/pv/prop/string.h
387-
DSView/pv/dialogs/storeprogress.h
388-
DSView/pv/storesession.h
389-
DSView/pv/view/devmode.h
390-
DSView/pv/dialogs/waitingdialog.h
391-
DSView/pv/dialogs/dsomeasure.h
392-
DSView/pv/dialogs/calibration.h
393-
DSView/pv/dialogs/protocollist.h
394-
DSView/pv/dialogs/protocolexp.h
395-
DSView/pv/dialogs/fftoptions.h
396-
DSView/pv/data/mathstack.h
397-
DSView/pv/view/mathtrace.h
398-
DSView/pv/view/viewstatus.h
399-
DSView/pv/toolbars/titlebar.h
400-
DSView/pv/mainframe.h
401-
DSView/pv/widgets/border.h
402-
DSView/pv/dialogs/dsmessagebox.h
403-
DSView/pv/dialogs/shadow.h
404-
DSView/pv/dialogs/dsdialog.h
405-
DSView/pv/dialogs/interval.h
406-
DSView/pv/dialogs/lissajousoptions.h
407-
DSView/pv/view/lissajoustrace.h
408-
DSView/pv/view/spectrumtrace.h
409-
DSView/pv/data/spectrumstack.h
410-
DSView/pv/dialogs/mathoptions.h
411-
DSView/pv/dialogs/regionoptions.h
412-
DSView/pv/view/xcursor.h
413-
DSView/pv/view/signal.h
414-
DSView/pv/view/logicsignal.h
415-
DSView/pv/view/analogsignal.h
416-
DSView/pv/view/dsosignal.h
417-
DSView/pv/dock/protocoldock.h
418-
DSView/pv/data/decoderstack.h
419-
DSView/pv/view/decodetrace.h
420-
DSView/pv/widgets/decodergroupbox.h
421-
DSView/pv/widgets/decodermenu.h
422-
DSView/pv/config/appconfig.h
423-
DSView/pv/appcontrol.h
424-
DSView/pv/dstimer.h
425-
DSView/pv/eventobject.h
426-
DSView/pv/ZipMaker.h
427-
DSView/pv/data/decode/annotationrestable.h
428-
DSView/pv/data/decode/decoderstatus.h
429-
DSView/pv/dock/protocolitemlayer.h
430-
DSView/pv/ui/msgbox.h
431-
DSView/pv/ui/dscombobox.h
432-
DSView/pv/dsvdef.h
433-
DSView/pv/dialogs/applicationpardlg.h
434-
DSView/pv/dock/keywordlineedit.h
435-
DSView/pv/dock/searchcombobox.h
436-
DSView/pv/dialogs/decoderoptionsdlg.h
437-
DSView/pv/utility/encoding.h
438-
DSView/pv/utility/path.h
439-
DSView/pv/utility/array.h
440-
DSView/pv/deviceagent.h
441-
DSView/pv/ui/fn.h
243+
442244
)
443245

444246
#===============================================================================

‎DSView/basedef.h‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,30 @@
3333
#define DSV_HIDDEN __attribute__((visibility("hidden")))
3434
#endif
3535

36+
37+
#define countof(x) (sizeof(x)/sizeof(x[0]))
38+
39+
#define begin_element(x) (&x[0])
40+
#define end_element(x) (&x[countof(x)])
41+
42+
enum View_type {
43+
TIME_VIEW,
44+
FFT_VIEW,
45+
ALL_VIEW
46+
};
47+
48+
#define DESTROY_OBJECT(p) if((p)){delete (p); p = NULL;}
49+
#define DESTROY_QT_OBJECT(p) if((p)){((p))->deleteLater(); p = NULL;}
50+
#define DESTROY_QT_LATER(p) ((p))->deleteLater();
51+
52+
#define RELEASE_ARRAY(a) for (auto ptr : (a)){delete ptr;} (a).clear();
53+
54+
#define ABS_VAL(x) ((x) > 0 ? (x) : -(x))
55+
56+
#define ds_max(a,b) ((a) > (b) ? (a) : (b))
57+
#define ds_min(a,b) ((a) < (b) ? (a) : (b))
58+
59+
#define SESSION_FORMAT_VERSION 3
60+
#define HEADER_FORMAT_VERSION 3
61+
3662
#endif

DSView/pv/dstimer.cpp renamed to DSView/com/dstimer.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
#include "dstimer.h"
2323
#include <assert.h>
2424

25-
25+
namespace dsv{
26+
namespace com{
27+
2628
DsTimer::DsTimer()
2729
{
2830
_binded = false;
@@ -106,3 +108,6 @@ void DsTimer::SetCallback(CALLBACL_FUNC f)
106108
{
107109
_beginTime = high_resolution_clock::now();
108110
}
111+
112+
} //namespace com
113+
} //namespace dsv

DSView/pv/dstimer.h renamed to DSView/com/dstimer.h

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,21 @@
1919
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2020
*/
2121

22-
#ifndef _DS_TIMER_H
23-
#define _DS_TIMER_H
22+
#ifndef COM_DS_TIMER_H
23+
#define COM_DS_TIMER_H
2424

2525
#include <QObject>
2626
#include <functional>
2727
#include <QTimer>
2828
#include <chrono>
2929

30-
using std::chrono::high_resolution_clock;
31-
using std::chrono::milliseconds;
30+
namespace dsv{
31+
namespace com{
3232

3333
typedef std::function<void()> CALLBACL_FUNC;
3434

35+
using std::chrono::high_resolution_clock;
36+
using std::chrono::milliseconds;
3537

3638
class DsTimer : protected QObject
3739
{
@@ -71,4 +73,7 @@ private slots:
7173
CALLBACL_FUNC _call;
7274
};
7375

76+
} //namespace com
77+
} //namespace dsv
78+
7479
#endif

‎DSView/config.h.in‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)