Commits

Des Small authored 639649567bf Merge
Merge branch 'master' into feature/CAS-12493
No tags

code/display/QtViewer/QtDisplayPanelGui.qo.h

Modified
274 274 return use_new_regions;
275 275 }
276 276
277 277 // called to indicate application activation state... true -> activated, false -> deactivated
278 278 void activate( bool );
279 279
280 280 // display cursor information for the specified point (in world coordinates)
281 281 void updateCursorInfo( WorldCanvas *wc, casacore::Quantity x, casacore::Quantity y );
282 282 typedef std::pair<QString, std::shared_ptr<casacore::ImageInterface<float> > > OverplotInterface;
283 283
284 +#if defined(WITHOUT_DBUS)
285 + // Hold and release of refresh. In order to draw, every call to hold()
286 + // must be accompanied by a subsequent call to release() (so don't
287 + // neglect: beware of exceptions, e.g.). Calls can nest (they are
288 + // counted). Panel may be deleted in a held state. Also, excess calls
289 + // to release() will have no effect. The calls are propagated to the main
290 + // PanelDisplay as well as to those used for color bars (and thence to
291 + // their WorldCanvases).
292 + //<group>
293 + void hold( ) { displayPanel( )->hold( ); }
294 + void release( ) { displayPanel( )->release( ); }
295 + //</group>
296 +#endif
297 +
284 298 public slots:
285 299
286 300 // At least for now, colorbars can only be placed horizontally or vertically,
287 301 // identically for all display panels. This sets that state for everyone.
288 302 // Sends out colorBarOrientationChange signal when the state changes.
289 303 virtual void setColorBarOrientation(bool vertical);
290 304
291 305 virtual QtDisplayPanelGui *createNewPanel( );
292 306
293 307 virtual void showDataManager();

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut