Merge pull request #111 from neuromore/master

Version 1.5.1

README.md

@@ -4,11 +4,13 @@
 
 [Click here to learn about neuromore Licensing](https://github.com/neuromore/studio/blob/master/neuromore-licensing-info.md)
 
-## Getting started
+## Getting started (all platforms)
 
-1. Create a neuromore Cloud account at [https://www.neuromore.com/download](https://www.neuromore.com/download)
+1. Create a neuromore Cloud account at [https://www.neuromore.com/createaccount](https://www.neuromore.com/createaccount)
 2. Download the latest neuromore studio from our github [releases](https://github.com/neuromore/studio/releases) (or build it yourself).
 3. Start neuromore studio, sign-in with the created community account, accept the license and you're ready to go.
+4. Check out the wiki for specific device information or on examples on how to get started https://github.com/neuromore/studio/wiki
+5. Watch the tutorials for more info [https://www.youtube.com/channel/UCAOU6SsvwCwC30hJaFLhWgw](https://www.youtube.com/channel/UCAOU6SsvwCwC30hJaFLhWgw)
 
 ## Contents
 

dist/osx/Studio.app/Contents/Info.plist

@@ -11,7 +11,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleVersion</key>
-	<string>Version 1.5.0</string>
+	<string>Version 1.5.1</string>
 	<key>CFBundleExecutable</key>
 	<string>Studio</string>
 	<key>CFBundleGetInfoString</key>
@@ -27,6 +27,6 @@
 	<key>LSMinimumSystemVersion</key>
 	<string>10.12.0</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.0</string>
+	<string>1.5.1</string>
 </dict>
 </plist>

dist/ubuntu-18.04/studio/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: studio
-Version: 1.5.0-1
+Version: 1.5.1-1
 Section: base
 Priority: optional
 Architecture: amd64

src/Engine/Devices/eemagine/eemagineDevices.cpp

@@ -219,6 +219,9 @@ eemagine8Device::eemagine8Device(DeviceDriver* driver) : eemagineDevice(driver)
 {
    LogDetailedInfo("Constructing eemagine with 8 channels ...");
    CreateSensors();
+
+   // set powersupplytype to line
+   SetPowerSupplyType(EPowerSupplyType::POWERSUPPLY_LINE);
 }
 
 eemagine8Device::~eemagine8Device()
@@ -258,6 +261,9 @@ eemagine32Device::eemagine32Device(DeviceDriver* driver) : eemagineDevice(driver
 {
    LogDetailedInfo("Constructing eemagine with 32 channels ...");
    CreateSensors();
+
+   // todo: set powersupplytype, battery or line?
+   //SetPowerSupplyType(EPowerSupplyType::POWERSUPPLY_LINE);
 }
 
 eemagine32Device::~eemagine32Device()
@@ -321,6 +327,9 @@ eemagine64Device::eemagine64Device(DeviceDriver* driver) : eemagineDevice(driver
 {
    LogDetailedInfo("Constructing eemagine with 64 channels ...");
    CreateSensors();
+
+   // todo: set powersupplytype, battery or line?
+   //SetPowerSupplyType(EPowerSupplyType::POWERSUPPLY_LINE);
 }
 
 eemagine64Device::~eemagine64Device()

src/Engine/Version.h

@@ -26,6 +26,6 @@
 
 	#define NEUROMORE_ENGINE_VERSION_MAJOR	1
 	#define NEUROMORE_ENGINE_VERSION_MINOR	5
-	#define NEUROMORE_ENGINE_VERSION_PATCH	0
+	#define NEUROMORE_ENGINE_VERSION_PATCH	1
 
 #endif

src/QtBase/Version.h

@@ -9,6 +9,6 @@
 
 	#define NEUROMORE_QTBASE_VERSION_MAJOR	1
 	#define NEUROMORE_QTBASE_VERSION_MINOR	5
-	#define NEUROMORE_QTBASE_VERSION_PATCH	0
+	#define NEUROMORE_QTBASE_VERSION_PATCH	1
 
 #endif

src/Studio/AppManager.h

@@ -83,7 +83,7 @@ class AppManager : public QObject
 		const char* GetDocumentationUrl() const							{ return "https://doc.neuromore.com"; }
 		const char* GetAccountUrl() const								{ return "https://account.eego-perform.com"; }
 		const char* GetStoreUrl() const									{ return "https://eego-perform.com"; }
-		const char* GetForgotPasswordUrl() const						{ return "https://account.eego-perform.com/#/resetrequest"; }
+		const char* GetForgotPasswordUrl() const						{ return "https://account.eego-perform.com/resetrequest"; }
 		const char* GetSupportEMail() const								{ return "[email protected]"; }
 		const char* GetAppShortName() const								{ return "eego-perform-studio"; }
 		const char* GetMenuStudioName() const							{ return "EPStudio"; }

src/Studio/MainWindow.cpp

@@ -2326,9 +2326,8 @@ void MainWindow::OnStartVisualization()
 	QAction*	action		= qobject_cast<QAction*>( sender() );
 	int			vizIndex	= action->property("index").toInt();
 
-	Visualization* visualization = GetManager()->GetVisualizationManager()->GetVisualization(vizIndex);
-	if (visualization != NULL)
-		visualization->Start();
+	// try to start it
+	const bool started = GetManager()->GetVisualizationManager()->Start(vizIndex);
 }
 
 

src/Studio/Plugins/ExperienceSelection/ExperienceSelectionWidget.cpp

@@ -29,6 +29,7 @@
 #include <Backend/FileSystemGetRequest.h>
 #include <Backend/FileSystemGetResponse.h>
 #include "../../MainWindow.h"
+#include "../../VisualizationManager.h"
 #include "../../AppManager.h"
 #include <QtBaseManager.h>
 #include <QGridLayout>
@@ -147,6 +148,10 @@ void ExperienceSelectionWidget::ReInit(bool downloadAssets)
 		CreateWidgetsForFolders(downloadAssets);
 	else
 		CreateWidgetsForFiles(downloadAssets);
+
+	// stop a running visualization
+	if (GetUser()->FindRule("STUDIO_SETTING_EasyWorkflow") != NULL)
+		GetManager()->GetVisualizationManager()->Stop();
 }
 
 

src/Studio/Plugins/SessionControl/PreSessionWidget.cpp

@@ -93,7 +93,6 @@ void PreSessionWidget::Init()
 	// add the level selection button (for local ones)
 	mVisSelectionButton = new QPushButton();
 
-	GetManager()->GetVisualizationManager()->ReInit();
 	if (GetManager()->GetVisualizationManager()->GetNumVisualizations() == 0)
 		mVisSelectionButton->setEnabled(false);
 
@@ -278,10 +277,10 @@ void PreSessionWidget::OnTotalTimeChanged(double value)
 
 void PreSessionWidget::OnSelectVisualizationClicked()
 {
-	// get the visualization manager and reinitalize it
 	VisualizationManager* vizManager = GetManager()->GetVisualizationManager();
-	vizManager->ReInit();
-
-	VisualizationSelectWindow selectVizWindow(GetMainWindow());
-	selectVizWindow.exec();
+	if (vizManager->GetNumVisualizations() > 0 && !vizManager->IsRunning())
+	{
+		VisualizationSelectWindow selectVizWindow(GetMainWindow());
+		selectVizWindow.exec();
+	}
 }

src/Studio/Plugins/SessionControl/SessionControlPlugin.cpp

@@ -740,13 +740,9 @@ void SessionControlPlugin::OnAfterLoadLayout()
 {
 	if (GetUser()->FindRule("STUDIO_SETTING_EasyWorkflow") != NULL)
 	{
-		// get the visualization manager and reinitalize it
+		// open visualization select window if one is available and none is running
 		VisualizationManager* vizManager = GetManager()->GetVisualizationManager();
-		vizManager->ReInit();
-
-		// open visualization select window
-		const uint32 numVisualizations = vizManager->GetNumVisualizations();
-		if (numVisualizations > 0)
+		if (vizManager->GetNumVisualizations() > 0 && !vizManager->IsRunning())
 		{
 			VisualizationSelectWindow selectVizWindow(GetMainWindow());
 			selectVizWindow.exec();

src/Studio/Resources/NMStudio.rc

@@ -11,8 +11,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION    1,5,0,0
-PRODUCTVERSION 1,5,0,0
+FILEVERSION    1,5,1,0
+PRODUCTVERSION 1,5,1,0
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@@ -29,12 +29,12 @@ BLOCK "040004b0"
 BEGIN
 VALUE "CompanyName", "neuromore co"
 VALUE "FileDescription", STRINGIZE(APPNAME)
-VALUE "FileVersion", "1.5.0.0"
+VALUE "FileVersion", "1.5.1.0"
 VALUE "InternalName", "neuromore.studio"
 VALUE "LegalCopyright", "Copyright (C) 2021"
 VALUE "OriginalFilename", ""
 VALUE "ProductName", STRINGIZE(APPNAME)
-VALUE "ProductVersion", "1.5.0.0"
+VALUE "ProductVersion", "1.5.1.0"
 END
 END
 BLOCK "VarFileInfo"

src/Studio/Version.h

@@ -26,6 +26,6 @@
 
 	#define NEUROMORE_STUDIO_VERSION_MAJOR	1
 	#define NEUROMORE_STUDIO_VERSION_MINOR	5
-	#define NEUROMORE_STUDIO_VERSION_PATCH	0
+	#define NEUROMORE_STUDIO_VERSION_PATCH	1
 
 #endif