pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hacked support for Vector File conversion into the GcodeFilesViewModel and the main javascript file. Should all be encapsulated in the svgtogcode plugin

Browse source 
TODO: figure out a way to move the code to the plugin
This commit is contained in:
Philipp Engel 2014-11-24 20:01:05 +01:00
parent 48422d7ea0
commit fe3b05256a
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/octoprint/static/js/app/main.js
View file

@ -77,7 +77,8 @@ $(function() {
var controlViewModel = new ControlViewModel(loginStateViewModel, settingsViewModel);
var terminalViewModel = new TerminalViewModel(loginStateViewModel, settingsViewModel);
var slicingViewModel = new SlicingViewModel(loginStateViewModel);
var gcodeFilesViewModel = new GcodeFilesViewModel(printerStateViewModel, loginStateViewModel, slicingViewModel);
var vectorConversionViewModel = new VectorConversionViewModel(loginStateViewModel);
var gcodeFilesViewModel = new GcodeFilesViewModel(printerStateViewModel, loginStateViewModel, slicingViewModel, vectorConversionViewModel);
var gcodeViewModel = new GcodeViewModel(loginStateViewModel, settingsViewModel);
var navigationViewModel = new NavigationViewModel(loginStateViewModel, appearanceViewModel, settingsViewModel, usersViewModel);
var logViewModel = new LogViewModel(loginStateViewModel);
@ -97,7 +98,8 @@ $(function() {
gcodeViewModel: gcodeViewModel,
navigationViewModel: navigationViewModel,
logViewModel: logViewModel,
slicingViewModel: slicingViewModel
slicingViewModel: slicingViewModel,
vectorConversionViewModel: vectorConversionViewModel
};
var allViewModels = _.values(viewModelMap);
@ -413,6 +415,7 @@ $(function() {
}
ko.applyBindings(slicingViewModel, document.getElementById("slicing_configuration_dialog"));
ko.applyBindings(vectorConversionViewModel, document.getElementById("dialog_vector_graphics_conversion"));
// apply bindings and signal startup
_.each(additionalViewModels, function(additionalViewModel) {
@ -421,7 +424,11 @@ $(function() {
}
// model instance, target container
ko.applyBindings(additionalViewModel[0], additionalViewModel[1]);
if (additionalViewModel[1]) {
ko.applyBindings(additionalViewModel[0], additionalViewModel[1]);
} else {
ko.applyBindings(additionalViewModel[0]);
}
if (additionalViewModel[0].hasOwnProperty("onAfterBinding")) {
additionalViewModel[0].onAfterBinding();

5
src/octoprint/static/js/app/viewmodels/files.js
View file

@ -1,9 +1,10 @@
function GcodeFilesViewModel(printerStateViewModel, loginStateViewModel, slicingViewModel) {
function GcodeFilesViewModel(printerStateViewModel, loginStateViewModel, slicingViewModel, vectorConversionViewModel) {
var self = this;
self.printerState = printerStateViewModel;
self.loginState = loginStateViewModel;
self.slicing = slicingViewModel;
self.conversion = vectorConversionViewModel;
self.isErrorOrClosed = ko.observable(undefined);
self.isOperational = ko.observable(undefined);
@ -192,7 +193,7 @@ function GcodeFilesViewModel(printerStateViewModel, loginStateViewModel, slicing
self.convertSVG = function(file) {
if (!file) return;
self.svgconversion.show(file.origin, file.name);
self.conversion.show(file.origin, file.name);
};
self.initSdCard = function() {