Merge pull request #44 from Kragrathea/TestBranch

Test branch
Kragrathea · Aug 19, 2020 · 86536a1 · 86536a1
2 parents 89c6aea + 17a7453
commit 86536a1
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/Todo.txt b/Todo.txt
@@ -0,0 +1 @@
+Top buttons in Div?
diff --git a/octoprint_prettygcode/static/css/prettygcode.css b/octoprint_prettygcode/static/css/prettygcode.css
@@ -33,6 +33,9 @@
 #tab_plugin_prettygcode .pgstatetoggle {
     display:none;
 }
+.pgfullscreen {
+    color:black;
+}
 .pgfullscreen #tab_plugin_prettygcode .pgfilestoggle {
     top: 20px;
     left: 95px;

diff --git a/octoprint_prettygcode/static/js/prettygcode.js b/octoprint_prettygcode/static/js/prettygcode.js
@@ -298,6 +298,7 @@ $(function () {
             this.showWebcam=true;
             this.showFiles=false;
             this.showDash=true;
+            this.antialias=true;
         };
 
         var pgSettings = new PGSettings();
@@ -380,6 +381,9 @@ $(function () {
                         gui.add(pgSettings, 'orbitWhenIdle');
                         gui.add(pgSettings, 'fatLines').onFinishChange(pgSettings.reloadGcode);
                         gui.add(pgSettings, 'reflections');
+                        gui.add(pgSettings, 'antialias').onFinishChange(function(){
+                                alert("Antialias chenges won't take effect until you refresh the page");
+                            });
                         //gui.add(pgSettings, 'reloadGcode');
 
                         var folder = gui.addFolder('Windows');//hidden.
@@ -1225,7 +1229,7 @@ $(function () {
 
         function initThree()
         {
-            renderer = new THREE.WebGLRenderer({ canvas: document.getElementById("mycanvas") });
+            renderer = new THREE.WebGLRenderer({ canvas: document.getElementById("mycanvas"),antialias: pgSettings.antialias });
             //todo. is this right?
             renderer.setPixelRatio(window.devicePixelRatio);
 

diff --git a/octoprint_prettygcode/templates/prettygcode_tab.jinja2 b/octoprint_prettygcode/templates/prettygcode_tab.jinja2
@@ -4,12 +4,12 @@
     {# <canvas  id='pipcanvas' style='position:absolute;right:0px;width:30%;height:30%'></canvas> #}
     <div id='mygui' class='pghidden'>View Settings</div>
 
-    <button class="pgstatetoggle"><i class="fa icon-black fa-info-circle"></i></button>
-    <button class="pgfilestoggle"><i class="fa icon-black fa-list"></i></button>
-    <button class="pgsettingstoggle">&#9881</button>
-    <button class="fstoggle">&#9974</button>
-    <button class="pgdashtoggle"><i class="fa fa-tachometer"></i></button>
-    <button class="pgcameratoggle">&#128247</button>
+    <button class="pgstatetoggle" title="Toggle state window"><i class="fa icon-black fa-info-circle"></i></button>
+    <button class="pgfilestoggle" title="Toggle file window"><i class="fa icon-black fa-list"></i></button>
+    <button class="pgsettingstoggle" title="Toggle settings window">&#9881</button>
+    <button class="fstoggle" title="Toggle fullscreen mode">&#9974</button>
+    <button class="pgdashtoggle" title="Toggle DashBoard window (if installed)"><i class="fa fa-tachometer"></i></button>
+    <button class="pgcameratoggle" title="Toggle webcam view window">&#128247</button>
   </div>
   
 

diff --git a/setup.py b/setup.py
@@ -14,7 +14,7 @@
 plugin_name = "OctoPrint-PrettyGCode"
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
-plugin_version = "1.2"
+plugin_version = "1.2.1"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module