@@ -83,9 +83,11 @@ static ModuleWidget* chooseModel(plugin::Model* model) { | |||||
mi.lastAdded = system::getUnixTime(); | mi.lastAdded = system::getUnixTime(); | ||||
// Create Module and ModuleWidget | // Create Module and ModuleWidget | ||||
INFO("Creating module %s", model->getFullName().c_str()); | |||||
engine::Module* module = model->createModule(); | engine::Module* module = model->createModule(); | ||||
APP->engine->addModule(module); | APP->engine->addModule(module); | ||||
INFO("Creating module widget %s", model->getFullName().c_str()); | |||||
ModuleWidget* moduleWidget = model->createModuleWidget(module); | ModuleWidget* moduleWidget = model->createModuleWidget(module); | ||||
APP->scene->rack->addModuleAtMouse(moduleWidget); | APP->scene->rack->addModuleAtMouse(moduleWidget); | ||||
@@ -189,6 +191,7 @@ struct ModelBox : widget::OpaqueWidget { | |||||
mwc = new ModuleWidgetContainer; | mwc = new ModuleWidgetContainer; | ||||
fb->addChild(mwc); | fb->addChild(mwc); | ||||
INFO("Creating module widget %s", model->getFullName().c_str()); | |||||
moduleWidget = model->createModuleWidget(NULL); | moduleWidget = model->createModuleWidget(NULL); | ||||
mwc->addChild(moduleWidget); | mwc->addChild(moduleWidget); | ||||
mwc->box.size = moduleWidget->box.size; | mwc->box.size = moduleWidget->box.size; | ||||
@@ -782,6 +782,7 @@ void ModuleWidget::cloneAction(bool cloneCables) { | |||||
engine::Module::jsonStripIds(moduleJ); | engine::Module::jsonStripIds(moduleJ); | ||||
// Clone Module | // Clone Module | ||||
INFO("Creating module %s", model->getFullName().c_str()); | |||||
engine::Module* clonedModule = model->createModule(); | engine::Module* clonedModule = model->createModule(); | ||||
// Set ID here so we can copy module storage dir | // Set ID here so we can copy module storage dir | ||||
@@ -798,6 +799,7 @@ void ModuleWidget::cloneAction(bool cloneCables) { | |||||
APP->engine->addModule(clonedModule); | APP->engine->addModule(clonedModule); | ||||
// Clone ModuleWidget | // Clone ModuleWidget | ||||
INFO("Creating module widget %s", model->getFullName().c_str()); | |||||
ModuleWidget* clonedModuleWidget = model->createModuleWidget(clonedModule); | ModuleWidget* clonedModuleWidget = model->createModuleWidget(clonedModule); | ||||
APP->scene->rack->addModuleAtMouse(clonedModuleWidget); | APP->scene->rack->addModuleAtMouse(clonedModuleWidget); | ||||
@@ -43,11 +43,13 @@ struct RackWidget::Internal { | |||||
static ModuleWidget* moduleWidgetFromJson(json_t* moduleJ) { | static ModuleWidget* moduleWidgetFromJson(json_t* moduleJ) { | ||||
plugin::Model* model = plugin::modelFromJson(moduleJ); | plugin::Model* model = plugin::modelFromJson(moduleJ); | ||||
assert(model); | assert(model); | ||||
INFO("Creating module %s", model->getFullName().c_str()); | |||||
engine::Module* module = model->createModule(); | engine::Module* module = model->createModule(); | ||||
assert(module); | assert(module); | ||||
module->fromJson(moduleJ); | module->fromJson(moduleJ); | ||||
// Create ModuleWidget | // Create ModuleWidget | ||||
INFO("Creating module widget %s", model->getFullName().c_str()); | |||||
ModuleWidget* moduleWidget = module->model->createModuleWidget(module); | ModuleWidget* moduleWidget = module->model->createModuleWidget(module); | ||||
assert(moduleWidget); | assert(moduleWidget); | ||||
return moduleWidget; | return moduleWidget; | ||||
@@ -361,6 +363,7 @@ void RackWidget::fromJson(json_t* rootJ) { | |||||
} | } | ||||
// Create ModuleWidget | // Create ModuleWidget | ||||
INFO("Creating module widget %s", module->model->getFullName().c_str()); | |||||
ModuleWidget* mw = module->model->createModuleWidget(module); | ModuleWidget* mw = module->model->createModuleWidget(module); | ||||
// pos | // pos | ||||
@@ -1230,6 +1230,7 @@ void Engine::fromJson(json_t* rootJ) { | |||||
} | } | ||||
// Create module | // Create module | ||||
INFO("Creating module %s", model->getFullName().c_str()); | |||||
Module* module = model->createModule(); | Module* module = model->createModule(); | ||||
assert(module); | assert(module); | ||||
@@ -61,6 +61,7 @@ void ModuleAdd::undo() { | |||||
} | } | ||||
void ModuleAdd::redo() { | void ModuleAdd::redo() { | ||||
INFO("Creating module %s", model->getFullName().c_str()); | |||||
engine::Module* module = model->createModule(); | engine::Module* module = model->createModule(); | ||||
module->id = moduleId; | module->id = moduleId; | ||||
try { | try { | ||||
@@ -71,6 +72,7 @@ void ModuleAdd::redo() { | |||||
} | } | ||||
APP->engine->addModule(module); | APP->engine->addModule(module); | ||||
INFO("Creating module widget %s", model->getFullName().c_str()); | |||||
app::ModuleWidget* mw = model->createModuleWidget(module); | app::ModuleWidget* mw = model->createModuleWidget(module); | ||||
mw->box.pos = pos; | mw->box.pos = pos; | ||||
APP->scene->rack->addModule(mw); | APP->scene->rack->addModule(mw); | ||||