From b444adb83d95ddbf9c7ca85ecb3976a009e7d50e Mon Sep 17 00:00:00 2001
From: Brady Bodily <itdepartment@asirobots.com>
Date: Tue, 1 Oct 2019 16:43:13 -0600
Subject: [PATCH] working better

---
 hw4/.idea/workspace.xml | 173 +---------------------------------------
 hw4/js/barChart.js      |  56 +++++++++----
 2 files changed, 44 insertions(+), 185 deletions(-)

diff --git a/hw4/.idea/workspace.xml b/hw4/.idea/workspace.xml
index b9080d6..e641536 100644
--- a/hw4/.idea/workspace.xml
+++ b/hw4/.idea/workspace.xml
@@ -2,6 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="906ccaea-ddf8-4975-a2c6-85ccd75313dc" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/js/barChart.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/barChart.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -9,82 +10,6 @@
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="-764738881">
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="html" value="1" />
-          <entry key="js" value="4" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="HTML" value="1" />
-          <entry key="JavaScript" value="4" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="html" value="83" />
-          <entry key="js" value="1498" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="HTML" value="83" />
-          <entry key="JavaScript" value="1498" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/hw4.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="176">
-              <caret line="49" column="52" lean-forward="true" selection-start-line="49" selection-start-column="52" selection-end-line="49" selection-end-column="52" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/js/barChart.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="122">
-              <caret line="34" column="27" lean-forward="true" selection-start-line="34" selection-start-column="27" selection-end-line="34" selection-end-column="27" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/js/infoPanel.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="134">
-              <caret line="14" column="15" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="15" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/js/map.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="225">
-              <caret line="15" column="15" selection-start-line="15" selection-start-column="15" selection-end-line="15" selection-end-column="15" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
       <find>xaxis</find>
@@ -93,41 +18,9 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
   </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/hw4.html" />
-        <option value="$PROJECT_DIR$/js/barChart.js" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectView">
-    <navigator proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="hw4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="hw4" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="Scope" />
-    </panes>
-  </component>
   <component name="PropertiesComponent">
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../hw3/script.js" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
   </component>
@@ -158,66 +51,4 @@
     </task>
     <servers />
   </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="6442000" />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="0" y="23" width="1280" height="731" extended-state="0" />
-    <editor active="true" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2494043" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info id="Favorites" order="2" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.3286385" />
-      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="8" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.3286385" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-    </layout>
-  </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/js/map.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="15" column="15" selection-start-line="15" selection-start-column="15" selection-end-line="15" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/d3.js">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/js/infoPanel.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="134">
-          <caret line="14" column="15" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/hw4.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="49" column="52" lean-forward="true" selection-start-line="49" selection-start-column="52" selection-end-line="49" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/js/barChart.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="122">
-          <caret line="34" column="27" lean-forward="true" selection-start-line="34" selection-start-column="27" selection-end-line="34" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-  </component>
 </project>
\ No newline at end of file
diff --git a/hw4/js/barChart.js b/hw4/js/barChart.js
index 4e40f26..24362d9 100644
--- a/hw4/js/barChart.js
+++ b/hw4/js/barChart.js
@@ -27,8 +27,8 @@ class BarChart {
       let svgHeight = d3.select("#barChart").style("height").replace("px", "");
       let svgWidth = d3.select("#barChart").style("width").replace("px", "");
 
-      let xaxisHeight = 20;
-      let yaxisWidth = 20;
+      let xaxisHeight = 60;
+      let yaxisWidth = 60;
       d3.select("#barChart")
           .attr("transform", "scale(1,-1)");
       console.log(data);
@@ -42,37 +42,65 @@ class BarChart {
       data.forEach(x => datadate.push(x.date));
 
       let yScale = d3.scaleLinear()
-          .domain([d3.max(dataNum), 0])
-          .range([0 ,d3.select("#barChart").style("height").replace("px", "")-100]);
+          .domain([0 , d3.max(dataNum)])
+          .range([svgHeight-(xaxisHeight), 0]);
+
       let xScale = d3.scaleBand()
           .domain(datadate)
-          .range([60, svgWidth - 100]);
+          .range([xaxisHeight, svgWidth-yaxisWidth])
+          .padding(.25);
 
-      let y_axis = d3.axisLeft()
-          .scale(yScale);
+      let y_axis = d3.axisLeft(yScale);
 
-      let x_axis = d3.axisBottom()
-          .scale(xScale);
+      let x_axis = d3.axisBottom(xScale)
+          .tickFormat((d,i) => datadate[i]);
+          //.scale(xScale);
 
 
       d3.select("#xAxis")
           .style("height", xaxisHeight)
-          .attr("transform",  "translate(0, 100) scale(1,-1)")
+          .attr("transform",  `translate(0, ${yaxisWidth}) scale(1,-1)`)
           .call(x_axis)
           .selectAll("text")
           .attr('transform', 'translate(15, 30) rotate(90)');
 
-
+    let height = svgHeight;
       d3.select("#yAxis")
-          .style("width", yaxisWidth)
-          .attr("transform",  `translate(60, ${svgHeight}) scale(1,-1)`)
+          //.style("width", yaxisWidth)
+          .attr("transform",  `translate(${xaxisHeight}, ${svgHeight}) scale(1,-1)`)
           .call(y_axis);
     // Create colorScale
 
     // Create the axes (hint: use #xAxis and #yAxis)
 
-    // Create the bars (hint: use #bars)
+    //Create the bars (hint: use #bars)
+      let barChart = d3.select("#bars")
+          .selectAll('rect')
+          .data(datadate)
+          .enter()
+          .append('rect')
+          .attr("transform",  `translate(0, ${height}) scale(1,-1)`)
+          .attr('x', (d,i) => xScale(d))
+          .attr('y', (d,i) => yScale(dataNum[i]))
+          .attr('width', xScale.bandwidth())
+          .attr('height', (d,i) => svgHeight - yScale(dataNum[i]))
+          .attr('class', 'bar');
+    //
 
+//      barChart.exit().remove();
+
+      // barChart.enter()
+      //     .append("rect")
+      //     .attr("data", function (d, i) {
+      //         console.log(d);
+      //         console.log(i);
+      //         return i;
+      //     })
+      //     .attr("height", d => yScale(d))
+      //     .attr("y", 0)
+      //     .attr("width", (svgWidth-100)/(dataNum.length +1))
+      //     .attr("transform",  "translate(60, 310) scale(1,-1)")
+      //     .style("fill", "steelblue");
 
     // ******* TODO: PART II *******