mirror of
				https://github.com/saitohirga/WSJT-X.git
				synced 2025-11-04 05:50:31 -05:00 
			
		
		
		
	Minor chenges to make waterfall gain/zero sliders easier to adjust.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8420 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
		
							parent
							
								
									d77917c857
								
							
						
					
					
						commit
						6d80c657ac
					
				@ -116,7 +116,7 @@ void CPlotter::draw(float swide[], bool bScroll, bool bRed)
 | 
			
		||||
  static int ktop=0;
 | 
			
		||||
  float y,y2,ymin;
 | 
			
		||||
  double fac = sqrt(m_binsPerPixel*m_waterfallAvg/15.0);
 | 
			
		||||
  double gain = fac*pow(10.0,0.02*m_plotGain);
 | 
			
		||||
  double gain = fac*pow(10.0,0.015*m_plotGain);
 | 
			
		||||
  double gain2d = pow(10.0,0.02*(m_plot2dGain));
 | 
			
		||||
 | 
			
		||||
  if(m_bReference != m_bReference0) resizeEvent(NULL);
 | 
			
		||||
@ -164,7 +164,7 @@ void CPlotter::draw(float swide[], bool bScroll, bool bRed)
 | 
			
		||||
  for(int i=0; i<iz; i++) {
 | 
			
		||||
    y=swide[i];
 | 
			
		||||
    if(y<ymin) ymin=y;
 | 
			
		||||
    int y1 = 10.0*gain*y + 10*m_plotZero +40;
 | 
			
		||||
    int y1 = 10.0*gain*y + m_plotZero;
 | 
			
		||||
    if (y1<0) y1=0;
 | 
			
		||||
    if (y1>254) y1=254;
 | 
			
		||||
    if (swide[i]<1.e29) painter1.setPen(g_ColorTbl[y1]);
 | 
			
		||||
@ -651,7 +651,7 @@ int CPlotter::binsPerPixel()                                   //binsPerPixel
 | 
			
		||||
  return m_binsPerPixel;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void CPlotter::setWaterfallAvg(int n)                         //setBinsPerPixel
 | 
			
		||||
void CPlotter::setWaterfallAvg(int n)                         //setNavg
 | 
			
		||||
{
 | 
			
		||||
  m_waterfallAvg = n;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										16
									
								
								widegraph.ui
									
									
									
									
									
								
							
							
						
						
									
										16
									
								
								widegraph.ui
									
									
									
									
									
								
							@ -103,14 +103,14 @@
 | 
			
		||||
      <item row="1" column="8">
 | 
			
		||||
       <widget class="QSlider" name="gain2dSlider">
 | 
			
		||||
        <property name="sizePolicy">
 | 
			
		||||
         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
 | 
			
		||||
         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
 | 
			
		||||
          <horstretch>0</horstretch>
 | 
			
		||||
          <verstretch>0</verstretch>
 | 
			
		||||
         </sizepolicy>
 | 
			
		||||
        </property>
 | 
			
		||||
        <property name="minimumSize">
 | 
			
		||||
         <size>
 | 
			
		||||
          <width>80</width>
 | 
			
		||||
          <width>100</width>
 | 
			
		||||
          <height>0</height>
 | 
			
		||||
         </size>
 | 
			
		||||
        </property>
 | 
			
		||||
@ -158,14 +158,14 @@
 | 
			
		||||
      <item row="0" column="8">
 | 
			
		||||
       <widget class="QSlider" name="gainSlider">
 | 
			
		||||
        <property name="sizePolicy">
 | 
			
		||||
         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
 | 
			
		||||
         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
 | 
			
		||||
          <horstretch>0</horstretch>
 | 
			
		||||
          <verstretch>0</verstretch>
 | 
			
		||||
         </sizepolicy>
 | 
			
		||||
        </property>
 | 
			
		||||
        <property name="minimumSize">
 | 
			
		||||
         <size>
 | 
			
		||||
          <width>80</width>
 | 
			
		||||
          <width>100</width>
 | 
			
		||||
          <height>0</height>
 | 
			
		||||
         </size>
 | 
			
		||||
        </property>
 | 
			
		||||
@ -385,14 +385,14 @@
 | 
			
		||||
      <item row="0" column="10">
 | 
			
		||||
       <widget class="QSlider" name="zeroSlider">
 | 
			
		||||
        <property name="sizePolicy">
 | 
			
		||||
         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
 | 
			
		||||
         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
 | 
			
		||||
          <horstretch>0</horstretch>
 | 
			
		||||
          <verstretch>0</verstretch>
 | 
			
		||||
         </sizepolicy>
 | 
			
		||||
        </property>
 | 
			
		||||
        <property name="minimumSize">
 | 
			
		||||
         <size>
 | 
			
		||||
          <width>80</width>
 | 
			
		||||
          <width>100</width>
 | 
			
		||||
          <height>0</height>
 | 
			
		||||
         </size>
 | 
			
		||||
        </property>
 | 
			
		||||
@ -416,14 +416,14 @@
 | 
			
		||||
      <item row="1" column="10">
 | 
			
		||||
       <widget class="QSlider" name="zero2dSlider">
 | 
			
		||||
        <property name="sizePolicy">
 | 
			
		||||
         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
 | 
			
		||||
         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
 | 
			
		||||
          <horstretch>0</horstretch>
 | 
			
		||||
          <verstretch>0</verstretch>
 | 
			
		||||
         </sizepolicy>
 | 
			
		||||
        </property>
 | 
			
		||||
        <property name="minimumSize">
 | 
			
		||||
         <size>
 | 
			
		||||
          <width>80</width>
 | 
			
		||||
          <width>100</width>
 | 
			
		||||
          <height>0</height>
 | 
			
		||||
         </size>
 | 
			
		||||
        </property>
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user