GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-29 07:14:24 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,636 Commits 288 Branches 260 Tags
Commit Graph

116 Commits

Author SHA1 Message Date
Jaime van Kessel
5c9e3c1e4d Extruders are now correctly filled in slicdeInfo 
CURA-3858
 2017-06-30 10:30:33 +02:00
Jaime van Kessel
c77ff8ea8b Initial set of changed setup for sliceinfo 
CURA-3858
 2017-06-29 16:54:12 +02:00
Jaime van Kessel
abae2cc28c Moved SliceInfoJob to it's own file 
CURA-3858
 2017-06-29 14:54:49 +02:00
Jack Ha
bedb41b6d3 SliceInfo now only sends sliceable model hashes (layer data was also sent) 2017-03-02 16:44:40 +01:00
Jack Ha
1029fb4ddd Not to trigger reslice happy anymore, only retrigger if necessary. Also using isSliceable instead of property check when inspecting root node. CURA-3413 CURA-3412 2017-03-02 16:38:31 +01:00
Simon Edwards
1b43e4981e Fixes for all of the plugins. Added a script to invoke mypy. (I'm stiiiick of .bat files. They are just broken.) 2017-01-17 16:57:37 +01:00
Thomas Karl Pietrowski
df63b2d620 Merge remote-tracking branch 'refs/remotes/origin/master-CURA-1445' into master-CURA-1445 2016-09-27 15:40:16 +02:00
Thomas Karl Pietrowski
ca60e517fa Revert "SliceInfo: Defining container_serialized as empty, before trying to serialize" 
This reverts commit 1fd169c6697f268588733e7a6d65e80d587b51ab.
 2016-09-27 15:39:54 +02:00
Thomas Karl Pietrowski
10d2d7902e Updating the comment about the "settings" keyword 
Contributes to CURA-1445
 2016-09-24 10:19:26 +02:00
Thomas Karl Pietrowski
db6702fbbc CURA-1445: Sending bundle of serialized data 
After an discussion with the developers at YM, we decided to send all data in one keyword.
So now all data is bundled into a JSON dictionary, where "" is the global_container_stack and it's containers go into the same JSON, too, by using their IDs as keywords.
More on JIRA...

Contributes to CURA-1445

Includes/Fixes #1013
 2016-09-22 18:24:01 +02:00
Thomas Karl Pietrowski
1fd169c669 SliceInfo: Defining container_serialized as empty, before trying to serialize 
While discussing with Jordy about the code I just found a problematic case where sending slice info could fail.
(This shouldn't happen, but..) If the first container is not serializable, then the for-loop will crash because container_serialized is not set for the if clause.
Additionally the if-clause is at the moment useless, because it is always true, because the content of container_serialized gets never resetted.

Contributes to CURA-1445
 2016-09-22 11:43:21 +02:00
Ghostkeeper
d3a9b349d1 Merge pull request #999 from Ultimaker/thopiekar-CURA-1445-use-HTTPS-again 
[CURA-1445] SliceInfo: Using HTTPS again
 2016-09-20 10:44:34 +02:00
Aldo Hoeben
9fb4fc3e65 Merge pull request #1000 from thopiekar/master-CURA-1852 
[CURA-1852] Sending material volumina per extruder
 2016-09-19 12:42:56 +02:00
Thomas Karl Pietrowski
8366cb8c9b CURA-1852: Removing TODO 
Removed the TODO tag, but left a little comment about what is happening in the following section.
 2016-09-19 09:50:09 +02:00
Thomas Karl Pietrowski
755b2e61e4 CURA-1852: Sending material volumina per extruder 2016-09-16 15:16:34 +02:00
Thomas Karl Pietrowski
41248a5133 SliceInfo: Using HTTPS again 
The problem seems to be related to our HTTP(S) server.
It is expected that the problem will be solved after the weekend.

Contributes to CURA-1445
 2016-09-16 14:36:32 +02:00
Jack Ha
31b0f74874 Change url of cura stats. CURA-1445 2016-09-13 15:09:33 +02:00
jack
7d5eb493c7 Merge pull request #967 from thopiekar/master-CURA-1445 
[CURA-1445] Adding hashes
 2016-09-13 12:55:01 +02:00
Thomas Karl Pietrowski
8571087f3e CURA-1445: Using .join instead 
Says in one line what I wanted to do.
 2016-09-09 00:24:32 +02:00
fieldOfView
fe34938bce Update wording 2016-09-07 13:57:09 +02:00
Thomas Karl Pietrowski
cf55178a11 Removing unused code 
We are collecting here a lot of data, which doesn't get submitted.
 2016-09-05 19:05:26 +02:00
Thomas Karl Pietrowski
dd02243790 SliceInfo: Adding log message and pass exception 
* removes unused "e"
* Using logException correctly

Conflicts:
	plugins/SliceInfoPlugin/SliceInfo.py
 2016-09-05 18:54:52 +02:00
Thomas Karl Pietrowski
6688b99cae CURA-1445: Adding md5 hashes 
... for every model placed on the build plate.
 2016-09-03 14:03:18 +02:00
fieldOfView
4de5360ac5 Use Logger.log instead of Logger.logException 
CURA-1923
 2016-08-08 10:43:48 +02:00
Thomas Karl Pietrowski
ecd80974f7 CURA-1923: Just something I missed 
Forgot to remove 'self' from 'super().__init__()'
 2016-08-07 09:04:24 +02:00
Thomas Karl Pietrowski
dbe1d140c4 Removing old function 2016-08-07 08:54:58 +02:00
Thomas Karl Pietrowski
e5ff77bc5c Showing less traceinfo 2016-08-07 08:17:31 +02:00
Thomas Karl Pietrowski
8e92cb4c91 CURA-1923: Don't return a complete traceback on HTTPError 
As discussed on GitHub we don't need a complete traceback on HTTPError.
However URLError should return a full traceback, like any other
exception that might occur.
 2016-08-07 08:16:22 +02:00
Thomas Karl Pietrowski
c7956542c4 CURA-1923: Rename SliceInfoThread to SliceInfoJob 2016-07-27 20:39:55 +02:00
Thomas Karl Pietrowski
dd9220068e CURA-1923: Using super.__init__() 2016-07-27 20:34:52 +02:00
Thomas Karl Pietrowski
7581aded7a CURA-1923: Remove tracking of jobs 
Like suggested by @awhiemstra.

Contributes to CURA-1923
 2016-07-27 20:32:44 +02:00
Thomas Karl Pietrowski
260b682864 CURA-1923: Slicinfo: Using UM.Job instead 
As suggested by @awhiemstra handling our "thread" here should be done
with UM.Job.
 2016-07-26 18:56:57 +02:00
Thomas Karl Pietrowski
36f4f51804 Adding missing return 
Without the function would be still progressed of course.
 2016-07-26 18:25:54 +02:00
Thomas Karl Pietrowski
8597b5c9be CURA-1923: SliceInfo: Sending data threaded 
The idea is to make the sending process, so it won't block the UI until the data is sent or the timeout has reached.
This commit does the following:
* Increasing the timeout to 5s
-> As we are sending our data threaded now this won't hurt. At least for clients in slow networks.
* Moving section for "sending data to info_url" into a seperate thread.
* Starting the thread instead and collecting all threads in a list
* Removing all threads from the list, if they have already finished their work.
* When the SliceInfo Extension gets __del__'d, it will wait for the threads until they finish.

Contributes to CURA-1923
 2016-07-25 22:25:26 +02:00
Thomas Karl Pietrowski
93a0637b23 Merge pull request #866 from thopiekar/master-CURA-1445-only 
CURA-1445: Using getDisplayString(ISO8601) in SliceInfo
 2016-07-25 13:42:26 +02:00
Thomas Karl Pietrowski
d9839ee41d SliceInfo: Using getDisplayString(ISO8601) instead 2016-07-25 13:40:19 +02:00
Jaime van Kessel
7a43164654 Both material weights & lengths are now exposed 
CURA-1038
 2016-07-15 15:49:25 +02:00
Jaime van Kessel
ec0e19e175 Removed material profiles field from sliceinfo 2016-07-13 14:20:41 +02:00
Thomas-Karl Pietrowski
bea67f0536 CURA-1445: Using getDurationInISOFormat in SliceInfo 
I think this is the way YouMagine expects the data to be sent.
 2016-07-11 12:10:03 +02:00
Thomas-Karl Pietrowski
a854554d94 CURA-1831: Adding only the basic workaround for OSX 2016-07-08 16:56:12 +02:00
Jaime van Kessel
57d0ad1bd0 Made exception handling of slice info plugin way more robust 
CURA-1831
 2016-07-06 16:32:24 +02:00
Thomas Karl Pietrowski
25c81ce1f8 Just a little typo 2016-07-05 18:55:13 +02:00
Jaime van Kessel
aba0392728 Saving g-code no longer crashes 2016-07-05 10:46:38 +02:00
Jaime van Kessel
318182495a We now recieve material estimation per extruder 
CURA-1687
 2016-07-04 17:11:03 +02:00
fieldOfView
3f7f6f8a23 Skip containers that can not be serialized 
CURA-1445
 2016-06-23 14:08:38 +02:00
Thomas Karl Pietrowski
3ea11d3063 SliceInfo: Removing debug code 2016-06-22 14:35:19 +02:00
Thomas Karl Pietrowski
4bc5883ad7 SliceInfo: Check for available data before submitting it 
The code here is self-explaining again..
 2016-06-22 14:30:20 +02:00
Thomas Karl Pietrowski
f1ac2405a7 Merge branch 'master-CURA-1615' of https://github.com/thopiekar/Cura.git into master-CURA-1445 2016-06-22 14:02:41 +02:00
Thomas Karl Pietrowski
1dc29fb984 SliceInfo: Correctly output the print time 2016-06-22 14:02:11 +02:00
Thomas Karl Pietrowski
e78bd92b7f SliceInfo: Adding all containers as serialized data 2016-06-22 14:01:23 +02:00