Changeset - d1ec2d001aae
Parent rev.
Child rev.
[Not reviewed]
channelmanager
0 2 0
Hasan Yavuz ÖZDERYA - 9 years ago 2017-01-02 15:14:04
hy@ozderya.net
update symbol colors as well
2 files changed with 23 insertions and 16 deletions:
src/plot.h
20
16
src/plotmanager.cpp
3
0 comments (0 inline, 0 general)
src/plot.h
➞
Show inline comments
 
@@ -34,34 +34,20 @@
 
#include "plotsnapshotoverlay.h"
 

			




	
	
	
		
 
class Plot : public QwtPlot

			




	
	
	
		
 
{

			




	
	
	
		
 
    Q_OBJECT

			




	
	
	
		
 

			




	
	
	
		
 
    friend class PlotManager;

			




	
	
	
		
 

			




	
	
	
		
 
public:

			




	
	
	
		
 
    Plot(QWidget* parent = 0);

			




	
	
	
		
 
    ~Plot();

			




	
	
	
		
 

			




	
	
	
		
 
    static QColor makeColor(unsigned int channelIndex);

			




	
	
	
		
 

			




	
	
	
		
 
private:

			




	
	
	
		
 
    bool isAutoScaled;

			




	
	
	
		
 
    double yMin, yMax;

			




	
	
	
		
 
    int symbolSize;

			




	
	
	
		
 
    Zoomer zoomer;

			




	
	
	
		
 
    ScaleZoomer sZoomer;

			




	
	
	
		
 
    QwtPlotGrid grid;

			




	
	
	
		
 
    PlotSnapshotOverlay* snapshotOverlay;

			




	
	
	
		
 
    QwtPlotLegendItem legend;

			




	
	
	
		
 
    QwtPlotTextLabel demoIndicator;

			




	
	
	
		
 

			




	
	
	
		
 
    /// update the display of symbols depending on `symbolSize`

			




	
	
	
		
 
    void updateSymbols();

			




	
	
	
		
 
    void resetAxes();

			




	
	
	
		
 
    void resizeEvent(QResizeEvent * event);

			




	
	
	
		
 

			




	
	
	
		
 
public slots:

			




	
	
	
		
 
    void showGrid(bool show = true);

			




	
	
	
		
 
    void showMinorGrid(bool show = true);

			




	
	
	
		
 
    void showLegend(bool show = true);

			




	
	
	
		
 
    void showDemoIndicator(bool show = true);

			




	
	
	
		
 
    void unzoom();

			




	
	
		
 
@@ -74,12 +60,30 @@ public slots:

			




	
	
	
		
 
     * @param light show a light colored (white) animation or the opposite

			




	
	
	
		
 
     */

			




	
	
	
		
 
    void flashSnapshotOverlay(bool light);

			




	
	
	
		
 

			




	
	
	
		
 
    void onNumOfSamplesChanged(unsigned value);

			




	
	
	
		
 

			




	
	
	
		
 
protected:

			




	
	
	
		
 
    /// update the display of symbols depending on `symbolSize`

			




	
	
	
		
 
    void updateSymbols();

			




	
	
	
		
 

			




	
	
	
		
 
private:

			




	
	
	
		
 
    bool isAutoScaled;

			




	
	
	
		
 
    double yMin, yMax;

			




	
	
	
		
 
    int symbolSize;

			




	
	
	
		
 
    Zoomer zoomer;

			




	
	
	
		
 
    ScaleZoomer sZoomer;

			




	
	
	
		
 
    QwtPlotGrid grid;

			




	
	
	
		
 
    PlotSnapshotOverlay* snapshotOverlay;

			




	
	
	
		
 
    QwtPlotLegendItem legend;

			




	
	
	
		
 
    QwtPlotTextLabel demoIndicator;

			




	
	
	
		
 

			




	
	
	
		
 
    void resetAxes();

			




	
	
	
		
 
    void resizeEvent(QResizeEvent * event);

			




	
	
	
		
 

			




	
	
	
		
 
private slots:

			




	
	
	
		
 
    void unzoomed();

			




	
	
	
		
 
    void onXScaleChanged();

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
#endif // PLOT_H

			




        

    


    
    

    

        

                

                    src/plotmanager.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -15,12 +15,13 @@

			




	
	
	
		
 

			




	
	
	
		
 
  You should have received a copy of the GNU General Public License

			




	
	
	
		
 
  along with serialplot.  If not, see <http://www.gnu.org/licenses/>.

			




	
	
	
		
 
*/

			




	
	
	
		
 

			




	
	
	
		
 
#include <QtDebug>

			




	
	
	
		
 
#include "qwt_symbol.h"

			




	
	
	
		
 

			




	
	
	
		
 
#include "plot.h"

			




	
	
	
		
 
#include "plotmanager.h"

			




	
	
	
		
 
#include "utils.h"

			




	
	
	
		
 
#include "setting_defines.h"

			




	
	
	
		
 

			




	
	
		
 
@@ -130,19 +131,21 @@ void PlotManager::onChannelInfoChanged(c

			




	
	
	
		
 
        curves[ci]->setPen(color);

			




	
	
	
		
 
        curves[ci]->setVisible(visible);

			




	
	
	
		
 

			




	
	
	
		
 
        // replot only updated widgets

			




	
	
	
		
 
        if (isMulti)

			




	
	
	
		
 
        {

			




	
	
	
		
 
            plotWidgets[ci]->updateSymbols(); // required for color change

			




	
	
	
		
 
            plotWidgets[ci]->replot();

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    // replot single widget

			




	
	
	
		
 
    if (!isMulti)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        plotWidgets[0]->updateSymbols();

			




	
	
	
		
 
        replot();

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void PlotManager::setMulti(bool enabled)

			




	
	
	
		
 
{

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: zserverv-307515
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support