Merge pull request #70 from durga2112/grid_controls

Grid controls
Astroua · Aug 5, 2015 · 14d6153 · 14d6153
2 parents a7a43e2 + 1608632
commit 14d6153
Show file tree

Hide file tree

Showing 10 changed files with 1,403 additions and 8 deletions.
diff --git a/carta/cpp/core/Data/Image/Controller.cpp b/carta/cpp/core/Data/Image/Controller.cpp
@@ -1127,7 +1127,6 @@ QString Controller::setClipValue( double clipVal  ) {
     return result;
 }
 
-
 void Controller::_viewResize( const QSize& newSize ){
     for ( int i = 0; i < m_datas.size(); i++ ){
         m_datas[i]->_viewResize( newSize );

diff --git a/carta/cpp/core/Data/Image/Controller.h b/carta/cpp/core/Data/Image/Controller.h
@@ -300,6 +300,10 @@ class Controller: public QObject, public Carta::State::CartaObject, public IColo
      */
     void resetState( const QString& state );
 
+    std::shared_ptr<GridControls> getGridControls() {
+        return m_gridControls;
+    }
+
     virtual ~Controller();
 
     static const QString CLASS_NAME;
@@ -404,7 +408,7 @@ private slots:
     //Data View
     std::shared_ptr<ImageView> m_view;
 
-    std::unique_ptr<GridControls> m_gridControls;
+    std::shared_ptr<GridControls> m_gridControls;
 
 
     std::unique_ptr<Settings> m_settings;

diff --git a/carta/cpp/core/Data/Image/DataGrid.cpp b/carta/cpp/core/Data/Image/DataGrid.cpp
@@ -421,7 +421,7 @@ QString DataGrid::_setAxesThickness( int thickness, bool* thicknessChanged ){
     QString result;
     if ( thickness < 0 || thickness > PEN_FACTOR ){
         result = "Axes thickness must be in [0,"+QString::number(PEN_FACTOR)+
-                "1]: "+QString::number(thickness);
+                "]: "+QString::number(thickness);
     }
     else {
         QString lookup = Carta::State::UtilState::getLookup( AXES, PEN_WIDTH );