Changeset 9783

Show
Ignore:
Timestamp:
10/12/08 11:32:41
Author:
trondeau
Message:

wip: Makefile hacks to get moc and uic to build their guys. Passes make distcheck now. Had to change the cpp and hpp files to cc and h for the makefile rules to take effect. This still needs some clean-up and automating.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/FrequencyDisplayPlot.cc

    r9766 r9783  
    1 #ifndef FREQUENCY_DISPLAY_PLOT_CPP 
    2 #define FREQUENCY_DISPLAY_PLOT_CPP 
    3  
    4 #include <FrequencyDisplayPlot.hpp> 
     1#ifndef FREQUENCY_DISPLAY_PLOT_C 
     2#define FREQUENCY_DISPLAY_PLOT_C 
     3 
     4#include <FrequencyDisplayPlot.h> 
    55 
    66#include <qwt_scale_draw.h> 
    …… 
    385385 
    386386 
    387 #endif /* FREQUENCY_DISPLAY_PLOT_CPP */ 
     387#endif /* FREQUENCY_DISPLAY_PLOT_C */ 

  • gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/FrequencyDisplayPlot.h

    r9766 r9783  
    1111#include <qwt_plot_panner.h> 
    1212#include <qwt_plot_marker.h> 
    13 #include <highResTimeFunctions.hpp> 
     13#include <highResTimeFunctions.h> 
    1414#include <qwt_symbol.h> 
    1515 

  • gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/Makefile.am

    r9766 r9783  
    5454BUILT_SOURCES =                 \ 
    5555        qtgui.cc                \ 
    56         qtgui.py                                 
     56        qtgui.py                \ 
     57        .ui/ui_spectrumdisplayform.h            \ 
     58        .moc/moc_spectrumdisplayform.cc         \ 
     59        .moc/moc_FrequencyDisplayPlot.cc        \ 
     60        .moc/moc_TimeDomainDisplayPlot.cc       \ 
     61        .moc/moc_WaterfallDisplayPlot.cc        \ 
     62        .moc/moc_Waterfall3DDisplayPlot.cc 
    5763 
    5864# This gets qtgui.py installed in the right place 
    …… 
    6874# These are the source files that go into the shared library 
    6975libqtgui_la_SOURCES =   \ 
     76        spectrumdisplayform.cc                  \ 
     77        FrequencyDisplayPlot.cc                 \ 
     78        TimeDomainDisplayPlot.cc                \ 
     79        WaterfallDisplayPlot.cc                 \ 
     80        Waterfall3DDisplayPlot.cc               \ 
     81        waterfallGlobalData.cc                  \ 
     82        SpectrumGUIClass.cc                     \ 
     83        spectrumUpdateEvents.cc                 \ 
     84        plot_waterfall.cc                       \ 
     85        spectrumdisplayform.ui                  \ 
     86        .moc/moc_spectrumdisplayform.cc         \ 
     87        .moc/moc_FrequencyDisplayPlot.cc        \ 
     88        .moc/moc_TimeDomainDisplayPlot.cc       \ 
     89        .moc/moc_WaterfallDisplayPlot.cc        \ 
     90        .moc/moc_Waterfall3DDisplayPlot.cc      \ 
    7091        qtgui_sink_c.cc                         \ 
    71         qtgui_sink_f.cc                         \ 
    72         FrequencyDisplayPlot.cpp                \ 
    73         TimeDomainDisplayPlot.cpp               \ 
    74         WaterfallDisplayPlot.cpp                \ 
    75         Waterfall3DDisplayPlot.cpp              \ 
    76         waterfallGlobalData.cpp                 \ 
    77         SpectrumGUIClass.cpp                    \ 
    78         spectrumdisplayform.cpp                 \ 
    79         spectrumUpdateEvents.cpp                \ 
    80         plot_waterfall.cpp                      \ 
    81         .moc/moc_FrequencyDisplayPlot.cpp       \ 
    82         .moc/moc_TimeDomainDisplayPlot.cpp      \ 
    83         .moc/moc_WaterfallDisplayPlot.cpp       \ 
    84         .moc/moc_Waterfall3DDisplayPlot.cpp     \ 
    85         .moc/moc_spectrumdisplayform.cpp 
     92        qtgui_sink_f.cc 
    8693 
    8794_qtgui_la_SOURCES =                     \ 
    …… 
    8996        qtgui.cc 
    9097 
    91 mocdir = .moc 
    9298moc_OBJECTS =   \ 
    93         FrequencyDisplayPlot.cpp      \ 
    94         TimeDomainDisplayPlot.cpp     \ 
    95         WaterfallDisplayPlot.cpp      \ 
    96         Waterfall3DDisplayPlot.cpp    \ 
    97         spectrumdisplayform.cpp 
     99        .moc/moc_spectrumdisplayform.cc               \ 
     100        .moc/moc_FrequencyDisplayPlot.cc              \ 
     101        .moc/moc_TimeDomainDisplayPlot.cc     \ 
     102        .moc/moc_WaterfallDisplayPlot.cc              \ 
     103        .moc/moc_Waterfall3DDisplayPlot.cc 
    98104 
    99105uic_OBJECTS = \ 
    …… 
    102108# These headers get installed in ${prefix}/include/gnuradio 
    103109grinclude_HEADERS =                     \ 
     110        spectrumdisplayform.h           \ 
     111        FrequencyDisplayPlot.h          \ 
     112        TimeDomainDisplayPlot.h         \ 
     113        WaterfallDisplayPlot.h          \ 
     114        Waterfall3DDisplayPlot.h        \ 
     115        SpectrumGUIClass.h              \ 
     116        waterfallGlobalData.h           \ 
     117        highResTimeFunctions.h          \ 
     118        plot_waterfall.h                \ 
     119        spectrumUpdateEvents.h          \ 
    104120        qtgui.h                         \ 
    105121        qtgui_sink_c.h                  \ 
    106         qtgui_sink_f.h                  \ 
    107         FrequencyDisplayPlot.hpp        \ 
    108         TimeDomainDisplayPlot.hpp       \ 
    109         WaterfallDisplayPlot.hpp        \ 
    110         Waterfall3DDisplayPlot.hpp      \ 
    111         SpectrumGUIClass.hpp            \ 
    112         spectrumdisplayform.hpp         \ 
    113         waterfallGlobalData.hpp         \ 
    114         highResTimeFunctions.hpp        \ 
    115         plot_waterfall.hpp              \ 
    116         spectrumUpdateEvents.hpp 
     122        qtgui_sink_f.h 
    117123 
    118 #$(filter %.ui,$(uic_OBJECTS)): %.ui: %.h 
    119 #       echo $@ \ 
    120 #       /usr/bin/uic-qt4 $< -o .ui/ui_$@ 
    121  
    122 spectrumdisplayform.ui: %.ui: %.h 
    123         /usr/bin/uic-qt4 spectrumdisplayform.ui  -o .ui/ui_$@ 
     124# Compiles spectrumdisplayform.ui to the UI header file 
     125.ui/ui_spectrumdisplayform.h: %.h: spectrumdisplayform.ui 
     126        /bin/mkdir -p .ui; \ 
     127        /usr/bin/uic-qt4 $(srcdir)/spectrumdisplayform.ui -o $@ 
    124128 
    125129 
    126 $(filter %.cpp,$(moc_OBJECTS)): %.cpp: %.hpp 
    127         /usr/bin/moc  -DQT_SHARED -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB $< -o $(mocdir)/moc_$@ 
     130# Compiles the moc header files into the .moc/moc_*.cc versions 
     131#$(filter %.cc,$(moc_OBJECTS)): %.cc: %.h 
     132#       echo $<; \ 
     133#       /bin/mkdir -p .moc; \ 
     134#       /usr/bin/moc  -DQT_SHARED -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB $(srcdir)/$@ -o .moc/moc_$@ 
     135 
     136$(moc_OBJECTS):; 
     137# extract the class name from the moc file name and passes <file>.h to the script to build .moc/moc_<file>.cc 
     138        /bin/mkdir -p .moc; \ 
     139        f=$@; \ 
     140        f1=$${f#.moc/moc_}; \ 
     141        /usr/bin/moc  -DQT_SHARED -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB $(srcdir)/$${f1/.cc/.h} -o $@ 
    128142 
    129143# magic flags 
    …… 
    152166 
    153167 
    154 MOSTLYCLEANFILES = $(BUILT_SOURCES) *.pyc .moc/* .ui/* 
     168MOSTLYCLEANFILES = $(BUILT_SOURCES) *.pyc 
    155169 
    156170#EXTRA_DIST=qtspectrum/GNUmakefile 

  • gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/SpectrumGUIClass.cc

    r9766 r9783  
    22#define SPECTRUM_GUI_CLASS_CPP 
    33 
    4 #include <SpectrumGUIClass.hpp> 
     4#include <SpectrumGUIClass.h> 
    55//Added by qt3to4: 
    66#include <QEvent> 

  • gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/SpectrumGUIClass.h

    r9766 r9783  
    77#include <qlabel.h> 
    88#include <qslider.h> 
    9 #include <spectrumUpdateEvents.hpp> 
     9#include <spectrumUpdateEvents.h> 
    1010 
    1111//#include <Windowing.hpp> 
    1212 
    1313class SpectrumDisplayForm; 
    14 #include <spectrumdisplayform.hpp> 
     14#include <spectrumdisplayform.h> 
    1515 
    1616#include <cmath> 

  • gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/TimeDomainDisplayPlot.cc

    r9766 r9783  
    1 #ifndef TIME_DOMAIN_DISPLAY_PLOT_CPP 
    2 #define TIME_DOMAIN_DISPLAY_PLOT_CPP 
     1#ifndef TIME_DOMAIN_DISPLAY_PLOT_C 
     2#define TIME_DOMAIN_DISPLAY_PLOT_C 
    33 
    4 #include <TimeDomainDisplayPlot.hpp> 
     4#include <TimeDomainDisplayPlot.h> 
    55 
    66#include <qwt_scale_draw.h> 
    …… 
    191191} 
    192192 
    193 #endif /* TIME_DOMAIN_DISPLAY_PLOT_CPP */ 
     193#endif /* TIME_DOMAIN_DISPLAY_PLOT_C */ 

  • gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/TimeDomainDisplayPlot.h

    r9766 r9783  
    1111#include <qwt_plot_panner.h> 
    1212#include <qwt_plot_marker.h> 
    13 #include <highResTimeFunctions.hpp> 
     13#include <highResTimeFunctions.h> 
    1414#include <qwt_symbol.h> 
    1515 

  • gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/Waterfall3DDisplayPlot.cc

    r9766 r9783  
    1 #ifndef WATERFALL_3D_DISPLAY_PLOT_CPP 
    2 #define WATERFALL_3D_DISPLAY_PLOT_CPP 
    3  
    4 #include <Waterfall3DDisplayPlot.hpp> 
     1#ifndef WATERFALL_3D_DISPLAY_PLOT_C 
     2#define WATERFALL_3D_DISPLAY_PLOT_C 
     3 
     4#include <Waterfall3DDisplayPlot.h> 
    55 
    66#include <qwt3d_helper.h> 
    …… 
    349349} 
    350350 
    351 #endif /* WATERFALL_3D_DISPLAY_PLOT_CPP */ 
     351#endif /* WATERFALL_3D_DISPLAY_PLOT_C */ 

  • gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/Waterfall3DDisplayPlot.h

    r9766 r9783  
    22#define WATERFALL_3D_DISPLAY_PLOT_HPP 
    33 
    4 #include <highResTimeFunctions.hpp> 
     4#include <highResTimeFunctions.h> 
    55 
    6 #include <waterfallGlobalData.hpp> 
     6#include <waterfallGlobalData.h> 
    77#include <qwt3d_surfaceplot.h> 
    88 

  • gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/WaterfallDisplayPlot.cc

    r9766 r9783  
    1 #ifndef WATERFALL_DISPLAY_PLOT_CPP 
    2 #define WATERFALL_DISPLAY_PLOT_CPP 
    3  
    4 #include <WaterfallDisplayPlot.hpp> 
     1#ifndef WATERFALL_DISPLAY_PLOT_C 
     2#define WATERFALL_DISPLAY_PLOT_C 
     3 
     4#include <WaterfallDisplayPlot.h> 
    55 
    66#include <qwt_color_map.h> 
    …… 
    481481} 
    482482 
    483 #endif /* WATERFALL_DISPLAY_PLOT_CPP */ 
     483#endif /* WATERFALL_DISPLAY_PLOT_C */ 

  • gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/WaterfallDisplayPlot.h

    r9766 r9783  
    66#include <qwt_plot_panner.h> 
    77 
    8 #include <plot_waterfall.hpp> 
     8#include <plot_waterfall.h> 
    99 
    10 #include <highResTimeFunctions.hpp> 
     10#include <highResTimeFunctions.h> 
    1111 
    1212class WaterfallDisplayPlot:public QwtPlot{ 

  • gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/plot_waterfall.cc

    r9766 r9783  
    66#include "qwt_scale_map.h" 
    77#include "qwt_color_map.h" 
    8 #include "plot_waterfall.hpp" 
     8#include "plot_waterfall.h" 
    99 
    1010#if QT_VERSION < 0x040000 

  • gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/plot_waterfall.h

    r9766 r9783  
    33 
    44#include <qglobal.h> 
    5 #include <waterfallGlobalData.hpp> 
     5#include <waterfallGlobalData.h> 
    66 
    77#include "qwt_valuelist.h"  

  • gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui.h

    r9076 r9783  
    2525 
    2626#include <qapplication.h> 
    27 #include "qtspectrum/SpectrumGUIClass.hpp" 
     27#include "SpectrumGUIClass.h" 
    2828 
    2929class qtgui_event : public QEvent 

  • gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui_sink_c.h

    r9165 r9783  
    2929#include <qapplication.h> 
    3030#include <qtgui.h> 
    31 #include "qtspectrum/SpectrumGUIClass.hpp" 
     31#include "SpectrumGUIClass.h" 
    3232 
    3333 

  • gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui_sink_f.h

    r9082 r9783  
    2828#include <qapplication.h> 
    2929#include <qtgui.h> 
    30 #include "qtspectrum/SpectrumGUIClass.hpp" 
     30#include "SpectrumGUIClass.h" 
    3131 
    3232 

  • gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/spectrumUpdateEvents.cc

    r9766 r9783  
    1 #ifndef SPECTRUM_UPDATE_EVENTS_CPP 
    2 #define SPECTRUM_UPDATE_EVENTS_CPP 
     1#ifndef SPECTRUM_UPDATE_EVENTS_C 
     2#define SPECTRUM_UPDATE_EVENTS_C 
    33 
    4 #include <spectrumUpdateEvents.hpp> 
     4#include <spectrumUpdateEvents.h> 
    55 
    66SpectrumUpdateEvent::SpectrumUpdateEvent(const std::complex<float>* fftPoints, const uint64_t numFFTDataPoints, const double* realTimeDomainPoints, const double* imagTimeDomainPoints, const uint64_t numTimeDomainDataPoints, const double timePerFFT, const timespec dataTimestamp, const bool repeatDataFlag, const bool lastOfMultipleUpdateFlag, const timespec generatedTimestamp, const int droppedFFTFrames):QEvent(QEvent::Type(10005)){ 
    …… 
    129129} 
    130130 
    131 #endif /* SPECTRUM_UPDATE_EVENTS_CPP */ 
     131#endif /* SPECTRUM_UPDATE_EVENTS_C */ 

  • gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/spectrumUpdateEvents.h

    r9766 r9783  
    1 #ifndef SPECTRUM_UPDATE_EVENTS_HPP 
    2 #define SPECTRUM_UPDATE_EVENTS_HPP 
     1#ifndef SPECTRUM_UPDATE_EVENTS_H 
     2#define SPECTRUM_UPDATE_EVENTS_H 
    33 
    44#include <QEvent> 
    55#include <QString> 
    66#include <complex> 
    7 #include <highResTimeFunctions.hpp> 
     7#include <highResTimeFunctions.h> 
    88 
    99class SpectrumUpdateEvent:public QEvent{ 
    …… 
    8080 
    8181 
    82 #endif /* SPECTRUM_UPDATE_EVENTS_HPP */ 
     82#endif /* SPECTRUM_UPDATE_EVENTS_H */ 

  • gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/spectrumdisplayform.cc

    r9766 r9783  
    22#include <QColorDialog> 
    33#include <QMessageBox> 
    4 #include <spectrumdisplayform.hpp> 
     4#include <spectrumdisplayform.h> 
    55 
    66int SpectrumDisplayForm::_openGLWaterfall3DFlag = -1; 

  • gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/spectrumdisplayform.h

    r9766 r9783  
    1 #ifndef SPECTRUM_DISPLAY_FORM_HPP 
    2 #define SPECTRUM_DISPLAY_FORM_HPP 
     1#ifndef SPECTRUM_DISPLAY_FORM_H 
     2#define SPECTRUM_DISPLAY_FORM_H 
    33 
    44#include "ui_spectrumdisplayform.h" 
    55 
    66class SpectrumGUIClass; 
    7 #include <SpectrumGUIClass.hpp> 
     7#include <SpectrumGUIClass.h> 
    88 
    9 #include <SpectrumGUIClass.hpp> 
    10 #include <FrequencyDisplayPlot.hpp> 
    11 #include <WaterfallDisplayPlot.hpp> 
    12 #include <Waterfall3DDisplayPlot.hpp> 
    13 #include <TimeDomainDisplayPlot.hpp> 
     9#include <SpectrumGUIClass.h> 
     10#include <FrequencyDisplayPlot.h> 
     11#include <WaterfallDisplayPlot.h> 
     12#include <Waterfall3DDisplayPlot.h> 
     13#include <TimeDomainDisplayPlot.h> 
    1414#include <QValidator> 
    1515#include <vector> 
    …… 
    8585}; 
    8686 
    87 #endif /* SPECTRUM_DISPLAY_FORM_HPP */ 
     87#endif /* SPECTRUM_DISPLAY_FORM_H */ 

  • gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/spectrumdisplayform.ui

    r9766 r9783  
    700700 </tabstops> 
    701701 <includes> 
    702   <include location="global" >SpectrumGUIClass.hpp</include> 
    703   <include location="global" >FrequencyDisplayPlot.hpp</include> 
    704   <include location="global" >WaterfallDisplayPlot.hpp</include> 
    705   <include location="global" >Waterfall3DDisplayPlot.hpp</include> 
    706   <include location="global" >TimeDomainDisplayPlot.hpp</include> 
     702  <include location="global" >SpectrumGUIClass.h</include> 
     703  <include location="global" >FrequencyDisplayPlot.h</include> 
     704  <include location="global" >WaterfallDisplayPlot.h</include> 
     705  <include location="global" >Waterfall3DDisplayPlot.h</include> 
     706  <include location="global" >TimeDomainDisplayPlot.h</include> 
    707707  <include location="global" >qvalidator.h</include> 
    708708  <include location="global" >vector</include> 

  • gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/waterfallGlobalData.cc

    r9766 r9783  
    22#define WATERFALL_GLOBAL_DATA_CPP 
    33 
    4 #include <waterfallGlobalData.hpp> 
    5  
    6 #include <Waterfall3DDisplayPlot.hpp> 
     4#include <waterfallGlobalData.h> 
     5 
     6#include <Waterfall3DDisplayPlot.h> 
    77 
    88WaterfallData::WaterfallData(const double minimumFrequency, const double maximumFrequency, const uint64_t fftPoints, const unsigned int historyExtent):