apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If a config file is set on arguments (or if there are custom parameters), parameters overwrite those in a loaded session.

Browse Source
This commit is contained in:
matlabbe
2018-08-31 11:53:34 -04:00
parent ade5dd6729
commit 0424bf181c
6 changed files with 53 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/find_object/FindObject.h
+2 -1
View File
@@ -31,6 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "find_object/FindObjectExp.h" // DLL export/import defines
#include "find_object/DetectionInfo.h"
#include "find_object/Settings.h"
#include <QtCore/QObject>
#include <QtCore/QString>
@@ -64,7 +65,7 @@ public:
FindObject(bool keepImagesInRAM_ = true, QObject * parent = 0);
virtual ~FindObject();
bool loadSession(const QString & path);
bool loadSession(const QString & path, const ParametersMap & customParameters = ParametersMap());
bool saveSession(const QString & path);
bool isSessionModified() const {return sessionModified_;}
include/find_object/Settings.h
+2 -2
View File
@@ -312,9 +312,9 @@ public:
static QString iniDefaultFileName() {return "config.ini";}
static QString iniPath();
static void init(const QString & fileName);
static ParametersMap init(const QString & fileName);
static void loadSettings(const QString & fileName = QString());
static ParametersMap loadSettings(const QString & fileName = QString());
static void loadWindowSettings(QByteArray & windowGeometry, QByteArray & windowState, const QString & fileName = QString());
static void saveSettings(const QString & fileName = QString());
static void saveWindowSettings(const QByteArray & windowGeometry, const QByteArray & windowState, const QString & fileName = QString());