Planner: Re-enable using the new profile.

This correctly enables the planner on the new profile,
but it doesn't triggers the correct paint on the canvas.

[Dirk Hohndel: remove other remnants of the disabled planner as well]

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

9 files changed, 13 insertions, 34 deletions

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 611bd2fb0..204aeb8e8 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -15,10 +15,6 @@ A2X = a2x
 BROWSER = firefox
 THEME = compact_subsurface
 PWD = $(realpath .)
-ENABLE_PLANNER := 0
-ifeq ($(ENABLE_PLANNER), 1)
-ENABLE_PLANNER_ATTR=-a ENABLE_PLANNER=$(ENABLE_PLANNER)
-endif
 
 all: doc $(addprefix $(DOCNAME).,pdf text)
 
@@ -33,11 +29,11 @@ $(OUT)$(DOCNAME).pdf: $(DOCSOURCE)
 $(OUT)$(HTMLDOC): $(DOCSOURCE)
 	@echo "if asciidoc isn't found the html file included in the sources is copied"
 	$(ASCIIDOC) -a toc -a toclevels=3 -a themedir=$(PWD) -a theme=$(THEME) -a stylesdir=$(PWD) \
-		$(ENABLE_PLANNER_ATTR) -o $(OUT)$(HTMLDOC) $< || cp $(HTMLDOC).git $(OUT)$(HTMLDOC)
+		-o $(OUT)$(HTMLDOC) $< || cp $(HTMLDOC).git $(OUT)$(HTMLDOC)
 
 # Alternatively::
 $(OUT)$(DOCNAME).xhtml: $(DOCSOURCE)
-	$(A2X) $(ENABLE_PLANNER_ATTR) --icons -f xhtml $<
+	$(A2X) --icons -f xhtml $<
 
 show: $(HTMLDOC)
 	$(BROWSER) $<
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 748a8c21f..697df1190 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1889,7 +1889,6 @@ language / country settings as the underlying OS. If this is for some reason
 undesirable users can uncheck this checkbox and pick a language / country
 combination from the list of included localizations.
 
-ifdef::ENABLE_PLANNER[]
 [[S_DivePlanner]]
 == The Subsurface dive planner
 The dive planner is accessed by selecting _Log -> Plan Dive_ from the main menu. This
@@ -1983,7 +1982,6 @@ there is no provision for any reserve gas.
 image::images/Planner2.jpg["FIGURE: Planning a dive: evaluation",align="center"]
 
 This part of the software is in active development.
-endif::ENABLE_PLANNER[]
 
 == Description of the Subsurface Main Menu items
 
@@ -2023,9 +2021,7 @@ from _www.Divelogs.de_.
 - <<S_EnterData,_Add Dive_>> - Manually add a new dive to the *Dive List* panel.
 - <<S_Renumber,_Renumber_>> - Renumber the dives listed in the *Dive List*
 panel.
-ifdef::ENABLE_PLANNER[]
 -_Plan Dive_ - This experimental feature allows planning of simple dives.
-endif::ENABLE_PLANNER[]
 - <<S_Group,_Auto Group_>> - Group the dives in the *Dive List* panel into dive
 trips.
 - _Edit Device Names_ - Edit the names of dive computers.
diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp
index 3ffacdd2b..4fff79666 100644
--- a/qt-ui/diveplanner.cpp
+++ b/qt-ui/diveplanner.cpp
@@ -215,9 +215,7 @@ DivePlannerWidget::DivePlannerWidget(QWidget *parent, Qt::WindowFlags f) : QWidg
 	QTableView *view = ui.cylinderTableWidget->view();
 	view->setColumnHidden(CylindersModel::START, true);
 	view->setColumnHidden(CylindersModel::END, true);
-#ifdef ENABLE_PLANNER
 	view->setColumnHidden(CylindersModel::DEPTH, false);
-#endif
 	view->setItemDelegateForColumn(CylindersModel::TYPE, new TankInfoDelegate(this));
 	connect(ui.cylinderTableWidget, SIGNAL(addButtonClicked()), DivePlannerPointsModel::instance(), SLOT(addCylinder_clicked()));
 	connect(ui.tableWidget, SIGNAL(addButtonClicked()), DivePlannerPointsModel::instance(), SLOT(addStop()));
diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp
index 2bb261448..34be53a90 100644
--- a/qt-ui/maintab.cpp
+++ b/qt-ui/maintab.cpp
@@ -88,9 +88,7 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent),
 
 	ui.cylinders->view()->setItemDelegateForColumn(CylindersModel::TYPE, new TankInfoDelegate(this));
 	ui.weights->view()->setItemDelegateForColumn(WeightModel::TYPE, new WSInfoDelegate(this));
-#ifdef ENABLE_PLANNER
 	ui.cylinders->view()->setColumnHidden(CylindersModel::DEPTH, true);
-#endif
 	completers.buddy = new QCompleter(&buddyModel, ui.buddy);
 	completers.divemaster = new QCompleter(&diveMasterModel, ui.divemaster);
 	completers.location = new QCompleter(&locationModel, ui.location);
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index 19a16a886..2bfeca64e 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -87,9 +87,6 @@ MainWindow::MainWindow() : QMainWindow(),
 	ui.ListWidget->scrollTo(ui.ListWidget->model()->index(0, 0), QAbstractItemView::PositionAtCenter);
 	ui.divePlannerWidget->settingsChanged();
 
-#ifndef ENABLE_PLANNER
-	ui.menuLog->removeAction(ui.actionDivePlanner);
-#endif
 #ifdef NO_MARBLE
 	ui.layoutWidget->hide();
 	ui.menuView->removeAction(ui.actionViewGlobe);
@@ -318,6 +315,7 @@ void MainWindow::on_actionDivePlanner_triggered()
 			break;
 		}
 	}
+	ui.newProfile->setPlanState();
 	ui.infoPane->setCurrentIndex(PLANNERWIDGET);
 }
 
diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp
index dc9a7189a..5efcf5a34 100644
--- a/qt-ui/models.cpp
+++ b/qt-ui/models.cpp
@@ -67,9 +67,7 @@ CylindersModel::CylindersModel(QObject *parent) : current(0), rows(0)
 {
 	//	enum {REMOVE, TYPE, SIZE, WORKINGPRESS, START, END, O2, HE, DEPTH};
 	setHeaderDataStrings(QStringList() << "" << tr("Type") << tr("Size") << tr("WorkPress") << tr("StartPress") << tr("EndPress") << trUtf8("O" UTF8_SUBSCRIPT_2 "%") << tr("He%")
-#ifdef ENABLE_PLANNER
 					   << tr("Switch at")
-#endif
 			     );
 }
 
@@ -145,11 +143,9 @@ QVariant CylindersModel::data(const QModelIndex &index, int role) const
 		case HE:
 			ret = percent_string(cyl->gasmix.he);
 			break;
-#ifdef ENABLE_PLANNER
 		case DEPTH:
 			ret = get_depth_string(cyl->depth, true);
 			break;
-#endif
 		}
 		break;
 	case Qt::DecorationRole:
@@ -263,13 +259,11 @@ bool CylindersModel::setData(const QModelIndex &index, const QVariant &value, in
 			changed = true;
 		}
 		break;
-#ifdef ENABLE_PLANNER
 	case DEPTH:
 		if (CHANGED()) {
 			cyl->depth = string_to_depth(vString.toUtf8().data());
 			changed = true;
 		}
-#endif
 	}
 	dataChanged(index, index);
 	if (addDiveMode)
diff --git a/qt-ui/models.h b/qt-ui/models.h
index 34d7d4827..17be8cbc9 100644
--- a/qt-ui/models.h
+++ b/qt-ui/models.h
@@ -102,9 +102,7 @@ public:
 		END,
 		O2,
 		HE,
-#ifdef ENABLE_PLANNER
 		DEPTH,
-#endif
 		COLUMNS
 	};
 
diff --git a/qt-ui/profile/profilewidget2.cpp b/qt-ui/profile/profilewidget2.cpp
index 2de64e71f..71a2f4856 100644
--- a/qt-ui/profile/profilewidget2.cpp
+++ b/qt-ui/profile/profilewidget2.cpp
@@ -773,6 +773,15 @@ void ProfileWidget2::setPlanState()
 	setProfileState();
 	disconnectTemporaryConnections();
 	/* show the same stuff that the profile shows. */
+
+	DivePlannerPointsModel *plannerModel = DivePlannerPointsModel::instance();
+	connect(plannerModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)), this, SLOT(replot()));
+	connect(plannerModel, SIGNAL(cylinderModelEdited()), this, SLOT(replot()));
+	connect(plannerModel, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
+		this, SLOT(pointInserted(const QModelIndex &, int, int)));
+	connect(plannerModel, SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
+		this, SLOT(pointsRemoved(const QModelIndex &, int, int)));
+
 	currentState = PLAN; /* enable the add state. */
 	setBackgroundBrush(QColor(Qt::green).light());
 }
diff --git a/subsurface.pro b/subsurface.pro
index 83dea66a4..d7189377a 100644
--- a/subsurface.pro
+++ b/subsurface.pro
@@ -15,11 +15,6 @@ else: TARGET = subsurface
 
 VERSION = 4.1.0
 
-# enable or disable the dive planner
-planner {
-	DEFINES += ENABLE_PLANNER
-}
-
 HEADERS = \
 	color.h \
 	deco.h \
@@ -237,10 +232,7 @@ QTTRANSLATIONS = \
 	qt_sv.qm \
 	qt_zh_TW.qm
 
-# Should we enable the planner sections in the manual?
-planner: ENABLE_PLANNER=1
-else: ENABLE_PLANNER=0
-doc.commands += $(CHK_DIR_EXISTS) $$OUT_PWD/Documentation || $(MKDIR) $$OUT_PWD/Documentation $$escape_expand(\\n\\t)$(MAKE) -C $$PWD/Documentation OUT=$$OUT_PWD/Documentation/ ENABLE_PLANNER=$$ENABLE_PLANNER doc
+doc.commands += $(CHK_DIR_EXISTS) $$OUT_PWD/Documentation || $(MKDIR) $$OUT_PWD/Documentation $$escape_expand(\\n\\t)$(MAKE) -C $$PWD/Documentation OUT=$$OUT_PWD/Documentation/ doc
 all.depends += doc
 QMAKE_EXTRA_TARGETS += doc all