Changeset 858

Show
Ignore:
Timestamp:
07/29/07 15:13:54 (1 year ago)
Author:
allenb
Message:

Add cycleMode method.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/fcptr_stable_jun07/Source/System/Statistics/Foregrounds/OSGPerfMonitorForeground.cpp

    r857 r858  
    119119 
    120120/*----------------------------- class specific ----------------------------*/ 
     121 
     122void PerfMonitorForeground::cycleMode(int increment) 
     123{ 
     124   int next_mode(getMode()); 
     125   next_mode += increment; 
     126   if (next_mode >= PerfMonitorForeground::MODE_END) 
     127   { next_mode = 0; } 
     128   if (next_mode < 0) 
     129   { next_mode = PerfMonitorForeground::MODE_END-1; } 
     130 
     131   setMode(unsigned(next_mode)); 
     132} 
     133 
    121134 
    122135void PerfMonitorForeground::changed(ConstFieldMaskArg whichField, UInt32 origin) 
  • branches/fcptr_stable_jun07/Source/System/Statistics/Foregrounds/OSGPerfMonitorForeground.h

    r857 r858  
    9191    typedef PointerBuilder<PerfMonitorForeground>::ObjPtrConstArg   ObjPtrConstArg; 
    9292 
     93 
     94    /** Cycle to the next display mode. */ 
     95    void cycleMode(int increment=1); 
     96 
    9397    /*---------------------------------------------------------------------*/ 
    9498    /*! \name                      Sync                                    */ 
  • branches/fcptr_stable_jun07/Source/System/Statistics/Foregrounds/testPerfMonitorForeground.cpp

    r857 r858  
    8080        } 
    8181        case 'm': 
     82           perfmon_fg->cycleMode(-1); 
     83           break; 
    8284        case 'M': 
    83         { 
    84            std::map<unsigned, std::string> name_map = boost::assign::map_list_of 
    85                   (PerfMonitorForeground::Text,              "Text") 
    86                   (PerfMonitorForeground::PercentLines,      "PercentLines") 
    87                   (PerfMonitorForeground::PercentTotalLines, "PercentTotalLines") 
    88                   (PerfMonitorForeground::MaxLines,          "MaxLines") 
    89                   (PerfMonitorForeground::ThreadTiming,      "ThreadTiming"); 
    90            unsigned next_mode = perfmon_fg->getMode(); 
    91            next_mode += 1; 
    92            if (next_mode >= PerfMonitorForeground::MODE_END) 
    93            { next_mode = 0; } 
    94            perfmon_fg->setMode(next_mode); 
    95            std::cout << "Set mode to: " << name_map[next_mode] << std::endl; 
    96         } 
    97         break; 
     85           perfmon_fg->cycleMode();         
     86           break; 
    9887 
    9988        // Output help about the controls 
  • branches/fcptr_stable_jun07/Source/System/Statistics/PerfMonitor/OSGPerfMonitor.cpp

    r857 r858  
    125125} 
    126126 
    127 unsigned PerfMonitorBase::max_samples = 100; 
     127unsigned PerfMonitorBase::max_samples = 500; 
    128128 
    129129OSG_END_NAMESPACE